From d64f81bccb25c98261b84a4355f92c3b32470606 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:32:56 +0800
Subject: [PATCH] 日期显示问题修改
---
Wms/WMS.BLL/DataServer/StockServer.cs | 718 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 669 insertions(+), 49 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index f15abb3..f784e43 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -9,6 +9,7 @@
using Model.InterFaceModel;
using Model.ModelDto;
using Model.ModelDto.DataDto;
+using Model.ModelDto.LogDto;
using Model.ModelDto.SysDto;
using Model.ModelVm.DataVm;
using Newtonsoft.Json;
@@ -16,6 +17,7 @@
using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
+using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllSoEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
@@ -88,9 +90,35 @@
//搴撳瓨鎬婚噺
List<MateDataStockDto> StockListDto = new List<MateDataStockDto>();
+ DataStockDetail detail = new DataStockDetail();
foreach (var item in StockList)
{
+
+ detail = Db.Queryable<DataStockDetail>().First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo && w.IsDel == "0");
+ if (detail != null)
+ {
+ if (!string.IsNullOrEmpty(detail.ProductionTime.ToString()))
+ {
+ item.ProductionTime = (DateTime)detail.ProductionTime;
+ }
+ else
+ {
+ item.ProductionTime = null;
+ }
+ if (!string.IsNullOrEmpty(detail.ExpirationTime.ToString()))
+ {
+ item.ExpirationTime = (DateTime)detail.ExpirationTime;
+ }
+ else
+ {
+ item.ExpirationTime = null;
+ }
+ item.InspectStatus = detail.InspectStatus;
+ }
+
+
+
StockListDto.Add(item);
////鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
//if (StockListDto.Count > 0)
@@ -236,10 +264,70 @@
categoryNo = categoryNo, //閫昏緫搴撳尯
type = type
});
+ foreach (var item in stockDetailsList)
+ {
+ if (!string.IsNullOrEmpty(item.LocatNo))
+ {
+ if (item.WareHouseNo == "W01")
+ {
+ item.PLCLocatNo = GetDjAdress(item.LocatNo.Substring(1, 2), item.LocatNo.Substring(0, 2), item.LocatNo.Substring(6, 2)).ToString() + item.LocatNo.Substring(2, 2) + item.LocatNo.Substring(4, 2);
+ }
+ }
+
+ }
return stockDetailsList;
}
#endregion
+
+ /// <summary>
+ /// 鏍规嵁鍌ㄤ綅鎺掕幏鍙栬泛鏈哄搴旂殑鍦板潃鎺�03010302
+ /// </summary>
+ /// <param name="road">鎺�02</param>
+ /// <param name="pai">鎺�03</param>
+ /// <param name="dept">娣卞害02</param>
+ /// <returns></returns>
+ public static int GetDjAdress(string road, string pai, string dept)
+ {
+ var roadNum = int.Parse(road);
+ var paiNum = int.Parse(pai);
+ var deptNum = int.Parse(dept);
+
+ var paiVal = 0;
+
+ // 鍒ゆ柇鎺掑鍋舵暟
+ if (paiNum % 2 == 0)
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 3;
+ }
+ else
+ {
+ paiVal = 4;
+ }
+ }
+ else
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 2;
+
+ }
+ else
+ {
+ paiVal = 1;
+
+ }
+ }
+
+ if (paiVal == 0)
+ {
+ throw new Exception("鎺掕浆鎹㈠け璐�");
+ }
+ return paiVal;
+
+ }
#region 浣庡簱瀛橀璀�
@@ -363,9 +451,12 @@
//startTime = startTime,
//endTime = endTime
});
+ DataStock stock = new DataStock();
+ stock = Db.Queryable<DataStock>().First();
//鍚堝苟鏁版嵁
int a = 0;
+ decimal qty = 0;
foreach (var h in totalHListData)
{
if (a >= totalCListData.Count)
@@ -374,16 +465,23 @@
}
foreach (var c in totalCListData)
{
+
//鍒ゆ柇鍑哄簱鏄惁鎷ユ湁鐩稿悓鎵规 涓旂墿鏂欑浉鍚�
if (h.LotNo == c.LotNo)
{
if (h.SkuNo == c.SkuNo && h.SkuName == c.SkuName)
{
+ stock = Db.Queryable<DataStock>().First(w=>w.SkuNo == h.SkuNo && w.SkuName == h.SkuName && w.LotNo == h.LotNo && w.IsDel == "0");
+ if (stock != null)
+ {
+ qty = stock.Qty;
+ }
h.CQty = c.CQty; //鍑哄簱鏁伴噺
h.CAllotQty = c.CAllotQty; //鍒嗛厤鏁伴噺
h.CFactQty = c.CFactQty; //涓嬫灦鏁伴噺
h.CompleteQty = c.CompleteQty; //鎷ｈ揣鏁伴噺
- //h.SONo = c.SONo; //鍑哄簱鍗曞彿
+ h.Qty = qty; //褰撳墠搴撳瓨
+
a += 1;
@@ -1060,13 +1158,18 @@
palletNo.Status = "2"; //宸插畬鎴�
Db.Updateable(palletNo).ExecuteCommand();
- //淇敼搴撳瓨鏄庣粏
- stockDetail.Status = "0";//寰呭垎閰�
- stockDetail.LocatNo = "";
- stockDetail.AreaNo = "";
- stockDetail.RoadwayNo = "";
- stockDetail.WareHouseNo = "";
- Db.Updateable(stockDetail).ExecuteCommand();
+
+ if (stockDetail !=null)
+ {
+ //淇敼搴撳瓨鏄庣粏
+ stockDetail.Status = "0";//寰呭垎閰�
+ stockDetail.LocatNo = "";
+ stockDetail.AreaNo = "";
+ stockDetail.RoadwayNo = "";
+ stockDetail.WareHouseNo = "";
+ Db.Updateable(stockDetail).ExecuteCommand();
+ }
+
#region 涓嬪彂WCS鏀捐揣瀹屾垚
var data = new
@@ -1088,20 +1191,24 @@
throw new Exception("鏀捐揣澶辫触锛學CS杩斿洖淇℃伅閿欒");
}
}
+
catch (Exception ex)
{
throw new Exception(ex.Message);
}
#endregion
-
+ palletNo.IsCancel = 0;
+ palletNo.IsSend = 0;
+ palletNo.IsFinish = 0;
+ Db.Updateable(palletNo).ExecuteCommand();
Db.CommitTran();
}
catch (Exception ex)
{
-
+ Db.RollbackTran();
throw new Exception("AGV杩斿洖鍏ュ簱瀹屾垚淇″彿澶勭悊閿欒锛岄敊璇俊鎭細" + ex);
}
}
@@ -1110,8 +1217,9 @@
/// AGV鍑哄簱瀹屾垚
/// </summary>
/// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <param name="url">鍙嶉MES澶囨枡瀹屾垚鍦板潃</param>
/// <returns></returns>
- public void SoFinish(string TaskCode)
+ public void SoFinish(string TaskCode,string url)
{
try
{
@@ -1153,12 +1261,162 @@
}
}
+
+ //瀹屾垚鎺ュ彛淇敼锛堟湭瀹屾垚锛�
+ //try
+ //{
+ // var palletNo = Db.Queryable<LogTask>().First(m => m.TaskNo == TaskCode && m.Status == "1");//鑾峰彇姝ｅ湪鎵ц鐨勪换鍔′俊鎭�
+ // if (palletNo == null)
+ // {
+ // throw new Exception("姝や换鍔″凡瀹屾垚");
+ // }
+ // var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.EndLocat); //鑾峰彇搴撲綅淇℃伅
+ // var storageStart = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.StartLocat); //鑾峰彇搴撲綅淇℃伅
+ // var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo.PalletNo).ToList();
+ // if (stockDetail.Count == 0)
+ // {
+ // throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+ // }
+ // //寮�鍚簨鍔�
+ // Db.BeginTran();
+ // if (storageLocat != null)
+ // {
+ // if (storageLocat.AreaNo == "B12")//杞﹂棿缂撳瓨浣嶉渶瑕侀�氱煡MES
+ // {
+ // var data = new List<RequertBeiliaoInfoModel>();
+ // //鏇存敼搴撳瓨鏄庣粏
+ // foreach (var item in stockDetail)
+ // {
+ // item.LocatNo = item.LocatNo;//鍌ㄤ綅鏇存敼
+ // item.WareHouseNo = item.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
+ // item.RoadwayNo = item.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
+ // item.AreaNo = item.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
+ // Db.Updateable(item).ExecuteCommand();
+
+
+ // if (string.IsNullOrWhiteSpace(item.SONo))
+ // {
+ // throw new Exception("褰撳墠鎵樼洏涓嶆槸鎷兼墭鍑哄簱鎵樼洏");
+ // }
+ // var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+ // if (boxInfo.Count == 0)
+ // {
+ // throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
+ // }
+ // //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
+ // var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
+ // {
+ // m.BoxNo
+ // }).Select(it => new DataBoxInfo()
+ // {
+ // BoxNo = it.BoxNo
+ // }).ToList();
+
+ // //璁板綍鎵樼洏涓婁俊鎭粰MES
+ // foreach (var item2 in boxno)
+ // {
+ // var a = item.ProductionTime.ToString();
+ // data.Add(new RequertBeiliaoInfoModel()
+ // {
+ // no = item2.BoxNo,
+ // materiel_no = item.SkuNo,
+ // materiel_name = item.SkuName,
+ // qty = item.Qty,
+ // batch = item.LotNo,
+ // producttime = item.ProductionTime.ToString().Substring(0, 10),
+ // expiry = item.ExpirationTime.ToString().Substring(0, 10)
+
+ // });
+ // }
+ // //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+ // Db.Deleteable(boxInfo).ExecuteCommand();
+ // //鍒犻櫎搴撳瓨鎵樼洏淇℃伅
+ // Db.Deleteable(item).ExecuteCommand();
+ // //鏇存敼搴撳瓨鎬昏〃
+ // var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ // stock.LockQty -= (decimal)item.Qty;
+ // stock.Qty -= (decimal)item.Qty;
+ // Db.Updateable(stock).ExecuteCommand();
+ // //鏇存敼鎵樼洏鐘舵��
+ // var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ // if (pallet != null)
+ // {
+ // pallet.Status = "0";
+ // Db.Updateable(pallet).ExecuteCommand();
+ // }
+
+ // }
+
+ // //鑾峰彇浠ょ墝
+ // //var token = new Token().GetMesToken(mesTokenUrl);
+ // var token = "";
+ // Dictionary<string, string> mesDic = new Dictionary<string, string>()
+ // {
+ // {"Authorization",token }
+ // };
+ // var endlono = palletNo.EndLocat;
+ // //缂撳瓨搴撲綅杞崲
+ // switch (palletNo.EndLocat.ToString().Substring(4, 1))
+ // {
+ // case "1":
+ // endlono = "Y003_00" + palletNo.EndLocat.ToString().Substring(6, 1);
+ // break;
+ // case "2":
+ // endlono = "Y138_0" + palletNo.EndLocat.ToString().Substring(5, 2);
+ // break;
+ // case "3":
+ // endlono = "Y128_0" + palletNo.EndLocat.ToString().Substring(5, 2);
+ // break;
+ // default:
+ // break;
+ // }
+ // var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
+ // var mesData = new RequertBeiliaoModel()
+ // {
+ // morder_no = mescode.OrderCode,
+ // pallet = stockDetail.First().PalletNo,
+ // layer_no = endlono,
+ // items = data
+ // };
+ // var jsonData = JsonConvert.SerializeObject(mesData);
+ // //璋冪敤鎺ュ彛
+ // var response = HttpHelper.DoPost(url, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
+
+ // var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ // if (obj.status != "success")
+ // {
+ // throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
+ // }
+
+
+ // }
+ // //淇敼鐩殑搴撲綅鐘舵��
+ // storageLocat.Status = "1";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ // Db.Updateable(storageLocat).ExecuteCommand();
+
+ // //淇敼浠诲姟鐘舵��
+ // palletNo.Status = "2"; //宸插畬鎴�
+ // Db.Updateable(palletNo).ExecuteCommand();
+
+ // //淇敼搴撳瓨鏄庣粏
+ // item.Status = "2";// 0:寰呭垎閰� 1:閮ㄥ垎鍒嗛厤 2锛氬凡鍒嗛厤 3锛氱洏鐐归攣瀹氾細 4绉诲簱閿佸畾
+ // stockDetail.LocatNo = storageLocat.LocatNo;
+ // stockDetail.AreaNo = storageLocat.AreaNo;
+ // stockDetail.RoadwayNo = storageLocat.RoadwayNo;
+ // stockDetail.WareHouseNo = storageLocat.WareHouseNo;
+ // Db.Updateable(stockDetail).ExecuteCommand();
+ // }
+ // Db.CommitTran();
+
+ //}
/// <summary>
/// AGV绉诲簱瀹屾垚
/// </summary>
/// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <param name="url">鍙嶉MES澶囨枡瀹屾垚鍦板潃</param>
/// <returns></returns>
- public void MoveFinish(string TaskCode)
+ public void MoveFinish(string TaskCode,string url)
{
try
{
@@ -1167,82 +1425,444 @@
{
throw new Exception("姝や换鍔″凡瀹屾垚");
}
- var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.EndLocat); //鑾峰彇搴撲綅淇℃伅
- var storageStart = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.StartLocat); //鑾峰彇搴撲綅淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo.PalletNo); //鑾峰彇搴撳瓨淇℃伅
+ var startLocat = new SysStorageLocat();
+
+ var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.EndLocat); //鑾峰彇鐩殑搴撲綅淇℃伅
+ if (endLocat == null)
+ {
+ throw new Exception("鏈壘鍒扮浉搴旂殑鐩殑搴撲綅");
+ }
+ var storageStart = new SysStorageLocat();
+
+ int isstock = 1;
+ var bindDetail = new BllPalletBind();
+ var sysPanlno = new SysPallets();
+
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo.PalletNo).ToList(); //鑾峰彇搴撳瓨淇℃伅
+ if (stockDetail.Count == 0)
+ {
+ //鏈壘鍒板簱瀛樺悗闇�瑕佸垽鏂槸鍚︽槸绌烘墭鐩樼Щ搴�
+ isstock = 0;
+ bindDetail = Db.Queryable<BllPalletBind>().OrderByDescending(w=>w.Id).First(w => w.IsDel == "0" && w.LocatNo == palletNo.StartLocat);//鑾峰彇缁勬墭鐩樹俊鎭�
+ if (bindDetail == null)
+ {
+ bindDetail = Db.Queryable<BllPalletBind>().OrderByDescending(w => w.Id).First(w => w.IsDel == "0" && w.LocatNo == palletNo.EndLocat);//鑾峰彇缁勬墭鐩樹俊鎭�
+ if (bindDetail == null)
+ {
+ throw new Exception("鏈壘鍒扮┖鎵樼洏缁勬墭淇℃伅");
+ }
+ }
+ }
+ else
+ {
+ storageStart = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.StartLocat); //鑾峰彇璧峰搴撲綅淇℃伅
+ if (storageStart == null)
+ {
+ isstock = 2; //搴撳彛鍒扮紦瀛樹綅浠诲姟
+ }
+ }
//var soAllot = Db.Queryable<BllExportAllot>().First(m => m.IsDel == "0" && m.PalletNo == palletNo.PalletNo);//鑾峰彇鍒嗛厤淇℃伅
//寮�鍚簨鍔�
Db.BeginTran();
- //淇敼璧峰搴撲綅鐘舵��
- storageLocat.Status = "0";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
- Db.Updateable(storageLocat).ExecuteCommand();
//淇敼鐩殑搴撲綅鐘舵��
- storageLocat.Status = "1";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
- Db.Updateable(storageLocat).ExecuteCommand();
+ endLocat.Status = "1";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(endLocat).ExecuteCommand();
//淇敼浠诲姟鐘舵��
palletNo.Status = "2"; //宸插畬鎴�
Db.Updateable(palletNo).ExecuteCommand();
- //淇敼搴撳瓨鏄庣粏
- stockDetail.Status = "2";// 0:寰呭垎閰� 1:閮ㄥ垎鍒嗛厤 2锛氬凡鍒嗛厤 3锛氱洏鐐归攣瀹氾細 4绉诲簱閿佸畾
- stockDetail.LocatNo = storageLocat.LocatNo;
- stockDetail.AreaNo = storageLocat.AreaNo;
- stockDetail.RoadwayNo = storageLocat.RoadwayNo;
- stockDetail.WareHouseNo = storageLocat.WareHouseNo;
- Db.Updateable(stockDetail).ExecuteCommand();
+ if (isstock == 1)
+ {
+ startLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletNo.StartLocat);
+ //淇敼璧峰搴撲綅鐘舵��
+ startLocat.Status = "0";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(startLocat).ExecuteCommand();
+ #region
+ var data = new List<RequertBeiliaoInfoModel>();
+
+ //鏇存敼搴撳瓨鏄庣粏
+ foreach (var item in stockDetail)
+ {
+ item.LocatNo = endLocat.LocatNo;//鍌ㄤ綅鏇存敼
+ item.WareHouseNo = endLocat.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
+ item.RoadwayNo = endLocat.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
+ item.AreaNo = endLocat.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
+ Db.Updateable(item).ExecuteCommand();
+
+ if (endLocat != null && endLocat.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
+ {
+ if (string.IsNullOrWhiteSpace(item.SONo))
+ {
+ throw new Exception("褰撳墠鎵樼洏涓嶆槸鎷兼墭鍑哄簱鎵樼洏");
+ }
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+ if (boxInfo.Count == 0)
+ {
+ throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
+ var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
+ {
+ m.BoxNo,
+ m.ProductionTime,
+ m.ExpirationTime,
+ }).Select(it => new DataBoxInfo()
+ {
+ BoxNo = it.BoxNo,
+ ProductionTime = it.ProductionTime,
+ ExpirationTime = it.ExpirationTime,
+ }).ToList();
+
+ //璁板綍鎵樼洏涓婁俊鎭粰MES
+ foreach (var item2 in boxno)
+ {
+ //var a = item.ProductionTime.ToString();
+ data.Add(new RequertBeiliaoInfoModel()
+ {
+ no = item2.BoxNo,
+ materiel_no = item.SkuNo,
+ materiel_name = item.SkuName,
+ qty = item.Qty,
+ batch = item.LotNo,
+ producttime = item2.ProductionTime.ToString().Substring(0, 10),
+ expiry = item2.ExpirationTime.ToString().Substring(0, 10)
+
+ });
+ }
+ //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+ Db.Deleteable(boxInfo).ExecuteCommand();
+ //鍒犻櫎搴撳瓨鎵樼洏淇℃伅
+ Db.Deleteable(item).ExecuteCommand();
+ //鏇存敼搴撳瓨鎬昏〃
+ var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ stock.LockQty -= (decimal)item.Qty;
+ stock.Qty -= (decimal)item.Qty;
+ Db.Updateable(stock).ExecuteCommand();
+ //鏇存敼鎵樼洏鐘舵��
+ var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo.PalletNo);
+ if (pallet != null)
+ {
+ pallet.Status = "0";
+ Db.Updateable(pallet).ExecuteCommand();
+ }
+ }
+ }
+
+
+ if (endLocat != null && endLocat.AreaNo == "B12")
+ {
+ //鑾峰彇浠ょ墝
+ //var token = new Token().GetMesToken(mesTokenUrl);
+ var token = "";
+ Dictionary<string, string> mesDic = new Dictionary<string, string>()
+ {
+ {"Authorization",token }
+ };
+ var endlono = endLocat.LocatNo;
+ //缂撳瓨搴撲綅杞崲
+ switch (endLocat.LocatNo.ToString().Substring(4, 1))
+ {
+ case "1":
+ endlono = "Y003_0" + endLocat.LocatNo.ToString().Substring(5, 2);
+ break;
+
+ }
+ var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
+ var mesData = new RequertBeiliaoModel()
+ {
+ morder_no = mescode.OrderCode,
+ pallet = stockDetail.First().PalletNo,
+ layer_no = endlono,
+ items = data
+ };
+ var jsonData = JsonConvert.SerializeObject(mesData);
+ //璋冪敤鎺ュ彛
+ var response = HttpHelper.DoPost(url, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
+
+ var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.status != "success")
+ {
+ throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
+ }
+
+ }
+ #endregion
+ }
+ else if (isstock == 0)
+ {
+ //淇敼缁勬墭淇℃伅
+ if (bindDetail.WareHouseNo == "W01") //1銆佺┖鎵樼洏鍨涘埌绌烘墭鐩樻敹闆嗗櫒锛�
+ {
+ bindDetail.WareHouseNo = "W02";
+ bindDetail.LocatNo = endLocat.LocatNo;
+ bindDetail.RoadwayNo = "";
+ //淇敼璧峰搴撲綅鐘舵��
+ startLocat.Status = "0";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(startLocat).ExecuteCommand();
+ }
+ else//2銆佹嫞璐у彨绌烘墭鐩橈紝灏忚溅瀹屾垚涓�娆★紝鎵ｅ噺涓�涓┖鎵樼洏鍨涗笂鏁伴噺
+ {
+ bindDetail.Qty = bindDetail.Qty - 1;
+ if (bindDetail.Qty == 0)//鏁伴噺涓�0鍚庢洿鏀圭粍鎵樼姸鎬佸拰鎵樼洏浣跨敤鐘舵��
+ {
+ bindDetail.Status = "2";
+ bindDetail.IsDel = "1";
+ //淇敼璧峰搴撲綅鐘舵��
+ startLocat.Status = "0";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
+ Db.Updateable(startLocat).ExecuteCommand();
+ }
+ else
+ {
+ bindDetail.LocatNo = startLocat.LocatNo;//?????鎷ｈ揣浣嶆墭鐩樺浣曞鐞嗭紝鎷ｈ揣浣嶆槸鍚﹂渶瑕佹洿鏀圭姸鎬侊紝鏄惁闇�瑕佸鍔犲簱瀛橈紱
+ }
+ }
+ Db.Updateable(bindDetail).ExecuteCommand();
+
+ }
+ else //搴撳彛绉诲簱鍒扮紦瀛樹綅
+ {
+
+ foreach (var item in stockDetail)
+ {
+ item.LocatNo = endLocat.LocatNo;//鍌ㄤ綅鏇存敼
+ item.WareHouseNo = endLocat.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
+ item.RoadwayNo = endLocat.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
+ item.AreaNo = endLocat.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
+ Db.Updateable(item).ExecuteCommand();
+ }
+ }
+ palletNo.IsCancel = 0;
+ palletNo.IsSend = 0;
+ palletNo.IsFinish = 0;
+ Db.Updateable(palletNo).ExecuteCommand();
Db.CommitTran();
}
catch (Exception ex)
{
-
+ Db.RollbackTran();
throw new Exception("AGV杩斿洖绉诲簱瀹屾垚淇″彿澶勭悊閿欒锛岄敊璇俊鎭細"+ex);
}
}
#endregion
- #region 鏁板瓧瀛敓绯荤粺鑾峰彇搴撳瓨淇℃伅
+ #region 鏁板瓧瀛敓绯荤粺鍙嶉淇℃伅
/// <summary>
/// 鍙嶉鏁板瓧瀛敓绯荤粺搴撳瓨淇℃伅
/// </summary>
/// <param name=""></param>
/// <returns></returns>
- public List<ReLocateData> GetLocateList()
+ public List<ReLocateDataModel> GetLocateList()
{
try
{
- List<ReLocateData> list = new List<ReLocateData>();
//搴撳瓨淇℃伅
- var stockDetailsList = Db.Queryable<StockDetailDto>().ToList();
-
- if (stockDetailsList.Count == 0)
- {
- return list;
- }
- for (int i = 0; i < stockDetailsList.Count; i++)
- {
- list[i].LocatNo = stockDetailsList[i].LocatNo; //搴撲綅
- list[i].PalletNo = stockDetailsList[i].PalletNo; //鎵樼洏鍙�
- list[i].SkuName = stockDetailsList[i].SkuName; //鐗╂枡鍚嶇О
- list[i].Stadard = stockDetailsList[i].Standard; //瑙勬牸
- list[i].LotNo = stockDetailsList[i].LotNo; //鎵规
- list[i].InspectStatus = stockDetailsList[i].InspectStatus; //璐ㄩ噺鐘舵��
- list[i].Qty = stockDetailsList[i].Qty.ToString(); //搴撳瓨鏁伴噺
- list[i].Warranty = stockDetailsList[i].ExpirationTime.ToString(); //鏈夋晥鏈� ??杩囨湡鏃堕棿锛屾槸鍚﹁鏇存敼
- }
+ var stockDetailsList = Db.Queryable<DataStockDetail>().ToList();
+ var sql = "select LocatNo,PalletNo,SkuName,Standard,LotNo,InspectStatus,Qty,ExpirationTime as Warranty from DataStockDetail ";
+
+ List<ReLocateDataModel> list = Db.Ado.SqlQuery<ReLocateDataModel>(sql);
+
+ //if (stockDetailsList.Count == 0)
+ //{
+ // return list;
+ //}
+ //foreach (var item in stockDetailsList)
+ //{
+ // list.Add(item);
+
+ //}
+ //for (int i = 0; i < stockDetailsList.Count; i++)
+ //{
+
+ // list.Add(stockDetailsList);
+ // list[i].LocatNo = stockDetailsList[i].LocatNo; //搴撲綅
+ // list[i].PalletNo = stockDetailsList[i].PalletNo; //鎵樼洏鍙�
+ // list[i].SkuName = stockDetailsList[i].SkuName; //鐗╂枡鍚嶇О
+ // list[i].Stadard = stockDetailsList[i].Standard; //瑙勬牸
+ // list[i].LotNo = stockDetailsList[i].LotNo; //鎵规
+ // list[i].InspectStatus = stockDetailsList[i].InspectStatus; //璐ㄩ噺鐘舵��
+ // list[i].Qty = stockDetailsList[i].Qty.ToString(); //搴撳瓨鏁伴噺
+ // list[i].Warranty = stockDetailsList[i].ExpirationTime.ToString(); //鏈夋晥鏈� ??杩囨湡鏃堕棿锛屾槸鍚﹁鏇存敼
+ //}
return list;
}
catch (Exception ex)
{
- throw new Exception("AGV杩斿洖鍏ュ簱瀹屾垚淇″彿澶勭悊閿欒锛岄敊璇俊鎭細" + ex);
+ throw new Exception("杩斿洖搴撳瓨淇℃伅鏈夎锛岄敊璇俊鎭細" + ex);
+ }
+ }
+
+
+
+ /// <summary>
+ /// 鍙嶉鏁板瓧瀛敓绯荤粺鎿嶄綔淇℃伅
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public List<ReLogDataModel> GetLogDataList()
+ {
+ try
+ {
+
+ //搴撳瓨淇℃伅
+ var stockDetailsList = Db.Queryable<DataStockDetail>().ToList();
+ var sql = "select LocatNo,PalletNo,SkuName,Standard,LotNo,InspectStatus,Qty,ExpirationTime as Warranty from DataStockDetail ";
+
+
+ var item2 = Expressionable.Create<LogOperationSO>()
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+ var list2 = Db.Queryable<LogOperationSO>().Where(item2)
+ .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
+ .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
+ .Select((it, dic, users) => new OperationDto()
+ {
+ Id = it.Id,
+ ParentNo = it.ParentNo,
+ MenuNo = it.MenuNo,
+ MenuName = it.MenuName,
+ FkNo = it.FkNo,
+ Type = dic.DictName,
+ Msg = it.Msg,
+ CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateUserName = users.RealName,
+ });
+
+ List<ReLogDataModel> list = Db.Ado.SqlQuery<ReLogDataModel>(sql);
+
+ return list;
+ }
+ catch (Exception ex)
+ {
+
+ throw new Exception("杩斿洖搴撳瓨淇℃伅鏈夎锛岄敊璇俊鎭細" + ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ鎿嶄綔鏃ュ織
+ /// </summary>
+ /// <param name="menuName">鑿滃崟鍚嶇О</param>
+ /// <param name="type">绫诲瀷</param>
+ /// <returns></returns>
+ public List<OperationDto> ReLogData()
+ {
+ try
+ {
+ var total = 0;
+ #region asn
+
+ var item = Expressionable.Create<LogOperationASN>()
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+ var list = Db.Queryable<LogOperationASN>().Where(item)
+ .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
+ .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
+ .Select((it, dic, users) => new OperationDto()
+ {
+ Id = it.Id,
+ ParentNo = it.ParentNo,
+ MenuNo = it.MenuNo,
+ MenuName = it.MenuName,
+ FkNo = it.FkNo,
+ Type = dic.DictName,
+ Msg = it.Msg,
+ CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateUserName = users.RealName,
+ });
+
+ #endregion
+
+ #region so
+
+ var item2 = Expressionable.Create<LogOperationSO>()
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+ var list2 = Db.Queryable<LogOperationSO>().Where(item2)
+ .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
+ .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
+ .Select((it, dic, users) => new OperationDto()
+ {
+ Id = it.Id,
+ ParentNo = it.ParentNo,
+ MenuNo = it.MenuNo,
+ MenuName = it.MenuName,
+ FkNo = it.FkNo,
+ Type = dic.DictName,
+ Msg = it.Msg,
+ CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateUserName = users.RealName,
+ });
+
+ #endregion
+
+ #region cr
+
+ var item3 = Expressionable.Create<LogOperationCR>()
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+ var list3 = Db.Queryable<LogOperationCR>().Where(item3)
+ .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
+ .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
+ .Select((it, dic, users) => new OperationDto()
+ {
+ Id = it.Id,
+ ParentNo = it.ParentNo,
+ MenuNo = it.MenuNo,
+ MenuName = it.MenuName,
+ FkNo = it.FkNo,
+ Type = dic.DictName,
+ Msg = it.Msg,
+ CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateUserName = users.RealName,
+ });
+
+ #endregion
+
+ #region sys
+
+ var item4 = Expressionable.Create<LogOperationSys>()
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+ var list4 = Db.Queryable<LogOperationSys>().Where(item4)
+ .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
+ .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
+ .Select((it, dic, users) => new OperationDto()
+ {
+ Id = it.Id,
+ ParentNo = it.ParentNo,
+ MenuNo = it.MenuNo,
+ MenuName = it.MenuName,
+ FkNo = it.FkNo,
+ Type = dic.DictName,
+ Msg = it.Msg,
+ CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateUserName = users.RealName,
+ });
+
+ #endregion
+
+ var data = Db.UnionAll(list, list2, list3, list4).OrderByDescending(it => it.CreateTime);
+ return data.OrderByDescending(m => m.CreateTime).ToList();
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
}
}
#endregion
--
Gitblit v1.8.0