From a0b82ad5eb966a359b393fbbe0d5f63d079f7dcb Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 12 六月 2025 11:02:01 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/HttpServer.cs | 587 +++++++++++++++++++++++++++++----------------------------
1 files changed, 299 insertions(+), 288 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 4d3a0f6..97b2d33 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -29,292 +29,303 @@
public OutCommandDto RequestPalletIn(string palletNo, string houseNo, int palletNum, string Strlocate)
{
- return null;
- //try
- //{
- // #region 鍒ゆ柇
- // if (string.IsNullOrEmpty(palletNo))
- // {
- // throw new Exception("鎵樼洏鍙蜂笉鑳戒负绌�");
- // }
- // if (string.IsNullOrEmpty(houseNo))
- // {
- // throw new Exception("浠撳簱鍙蜂笉鑳戒负绌�");
- // }
- // if (palletNum <= 0)
- // {
- // throw new Exception("鎵樼洏鏁伴噺涓嶈兘灏忕瓑0");
- // }
- // if (string.IsNullOrEmpty(Strlocate))
- // {
- // throw new Exception("璧峰浣嶇疆涓嶈兘涓虹┖");
- // }
- // //鑾峰彇鍌ㄤ綅淇℃伅
- // var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == houseNo && m.LocatNo == Strlocate);
- // if (locateInfo == null)
- // {
- // throw new Exception("鏈煡璇㈠埌绌哄偍浣�");
- // }
- // if (locateInfo.Flag != "0")
- // {
- // throw new Exception("褰撳墠浣嶇疆鏍囪瘑鐘舵�佹槸闈炴甯哥殑");
- // }
+ //return null;
+ try
+ {
+ #region 鍒ゆ柇
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鎵樼洏鍙蜂笉鑳戒负绌�");
+ }
+ if (string.IsNullOrEmpty(houseNo))
+ {
+ throw new Exception("浠撳簱鍙蜂笉鑳戒负绌�");
+ }
+ if (palletNum <= 0)
+ {
+ throw new Exception("鎵樼洏鏁伴噺涓嶈兘灏忕瓑0");
+ }
+ if (string.IsNullOrEmpty(Strlocate))
+ {
+ throw new Exception("璧峰浣嶇疆涓嶈兘涓虹┖");
+ }
+ //鑾峰彇鍌ㄤ綅淇℃伅
+ var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.LocatNo == Strlocate);
+ if (locateInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌绌哄偍浣�");
+ }
+ if (locateInfo.Flag != "0")
+ {
+ throw new Exception("褰撳墠浣嶇疆鏍囪瘑鐘舵�佹槸闈炴甯哥殑");
+ }
- // #endregion
+ #endregion
- // #region MyRegion
+ #region MyRegion
- // var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
- // if (stockDetail.Count > 0)
- // {
- // throw new Exception("褰撳墠鎵樼洏鍦ㄥ簱鍐呭凡鏈夊簱瀛樹俊鎭紝璇锋牳瀹�");
- // }
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+ if (stockDetail.Count > 0)
+ {
+ throw new Exception("褰撳墠鎵樼洏鍦ㄥ簱鍐呭凡鏈夊簱瀛樹俊鎭紝璇锋牳瀹�");
+ }
- // //鑾峰彇鎵樼洏淇℃伅
- // var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
- // if (pallet == null)
- // {
- // throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅");
- // }
- // if (pallet.Status != "0")
- // {
- // throw new Exception("鎵樼洏鐘舵�佷笉鑳芥湭浣跨敤鐘舵��");
- // }
- // //鑾峰彇鎵樼洏淇℃伅
- // var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
- // var pNum = 0;
- // var bNum = 0;
+ //鑾峰彇鎵樼洏淇℃伅
+ var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (pallet == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅");
+ }
+ if (pallet.Status != "0")
+ {
+ throw new Exception("鎵樼洏鐘舵�佷笉鑳芥湭浣跨敤鐘舵��");
+ }
+ //鑾峰彇鎵樼洏淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒扮┖鎵樼洏鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+ }
+ var pNum = 0;
+ var bNum = 0;
- // new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
+ new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
- // var datetime = Db.GetDate();
- // Db.BeginTran();
+ var datetime = Db.GetDate();
+ Db.BeginTran();
- // // 鎻掑叆鎵樼洏缁戝畾琛�
- // var modelpb = new BllPalletBind
- // {
- // ASNNo = "",
- // ASNDetailNo = 0,
- // TaskNo = "", //浠诲姟鍙�
- // PalletNo = palletNo,
- // Qty = palletNum,
- // FullQty = pNum,
- // Status = "3", //涓婃灦瀹屾垚
- // Type = "1", //0 鐗╂枡鎵� 1 绌烘墭
- // LotNo = "",
- // LotText = "",
- // SupplierLot = "",
- // InspectMark = "0", //0 鍚� 1 鏄�
- // BitPalletMark = pNum == palletNum ? "0" : "1",
- // IsBale = "0",
- // IsBelt = "0",
- // CreateUser = 0,
- // CreateTime = Db.GetDate()
- // };
- // var id = Db.Insertable(modelpb).ExecuteReturnIdentity();
-
- // #region 搴撳瓨鏄庣粏
- // var sd1 = new DataStockDetail()
- // {
- // LotNo = modelpb.LotNo,
- // LotText = modelpb.LotText,
- // SupplierLot = modelpb.SupplierLot,
- // SkuNo = sku.SkuNo,
- // SkuName = sku.SkuName,
- // Standard = sku.Standard,
- // Qty = modelpb.Qty,
- // LockQty = 0,
- // FrozenQty = 0,
- // InspectQty = 0,
- // ASNNo = modelpb.ASNNo,
- // ASNDetailNo = modelpb.ASNDetailNo,
- // WareHouseNo = "",
- // RoadwayNo = "",
- // AreaNo = "",
- // LocatNo = "",
- // PalletNo = modelpb.PalletNo,
- // PalletNo2 = modelpb.PalletNo2,
- // PalletNo3 = modelpb.PalletNo3,
- // PalletTags = "0",
- // CompleteTime = datetime,
- // ProductionTime = modelpb.ProductionTime,
- // ExpirationTime = modelpb.ExpirationTime,
- // Status = "0",
- // InspectMark = modelpb.InspectMark,
- // InspectStatus = sku.IsInspect,
- // BitPalletMark = modelpb.BitPalletMark,
- // PackagNo = sku.PackagNo,
- // IsBale = modelpb.IsBale,
- // IsBelt = modelpb.IsBelt,
+ // 鎻掑叆鎵樼洏缁戝畾琛�
+ var modelpb = new BllPalletBind
+ {
+ ASNNo = "",
+ ASNDetailNo = 0,
+ TaskNo = "", //浠诲姟鍙�
+ PalletNo = palletNo,
+ Qty = palletNum,
+ FullQty = pNum,
+ Status = "2", //涓婃灦瀹屾垚
+ Type = "1", //0 鐗╂枡鎵� 1 绌烘墭
+ LotNo = "",
+ LotText = "",
+ SupplierLot = "",
+ InspectMark = "0", //0 鍚� 1 鏄�
+ BitPalletMark = pNum == palletNum ? "0" : "1",
+ IsBale = "0",
+ IsBelt = "0",
+ CreateUser = 0,
+ CreateTime = Db.GetDate()
+ };
+ var id = Db.Insertable(modelpb).ExecuteReturnIdentity();
+
+ #region 鐢宠鍌ㄤ綅
+
+ SysStorageLocat locate = null;
- // IsDel = "0",
- // CreateUser = 0,
- // CreateTime = datetime
- // };
- // var sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
- // #endregion
+ //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+ if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+ {
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+ }
- // #region 搴撳瓨
- // var dataStock1 = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo);
- // if (dataStock1 != null)
- // {
- // dataStock1.Qty += modelpb.Qty;
- // if (modelpb.InspectMark == "1")
- // {
- // dataStock1.IsSampling = "0";
- // }
- // Db.Updateable(dataStock1).ExecuteCommand();
- // }
- // else
- // {
- // var stock = new DataStock()
- // {
- // SkuNo = sku.SkuNo,
- // SkuName = sku.SkuName,
- // Standard = sku.Standard,
- // LotNo = "",
- // LotText = "",
- // Qty = modelpb.Qty,
- // LockQty = 0,
- // FrozenQty = 0,
- // IsSampling = "0",
- // IsDel = "0",
- // CreateUser = 0,
- // CreateTime = datetime
- // };
- // Db.Insertable(stock).ExecuteCommand();
- // }
- // #endregion
+ var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
+ if (skuCategory == null)
+ {
+ throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+ }
+
+ var areaStr = skuCategory.AreaNo.Split(",");
+ var areaList = new List<string>();
+ foreach (var item in areaStr)
+ {
+ areaList.Add(item);
+ }
+ var allotLocate = new AllotLocation();
+ for (int i = 1; i <= 2; i++)
+ {
+ var iStr = i.ToString();
+ locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", iStr);
+ if (locate != null)
+ {
+ break;
+ }
+ }
- // #region 鐢宠鍌ㄤ綅
- // SysStorageLocat locate;
- // var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
- // if (sku == null)
- // {
- // throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
- // }
- // //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
- // if (string.IsNullOrWhiteSpace(sku.CategoryNo))
- // {
- // throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
- // }
+ #endregion
- // var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
- // if (skuCategory == null)
- // {
- // throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
- // }
-
- // var areaStr = skuCategory.AreaNo.Split(",");
- // var areaList = new List<string>();
- // foreach (var item in areaStr)
- // {
- // areaList.Add(item);
- // }
-
- // locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", ceng);
+ #region 搴撳瓨鏄庣粏
+ var sd1 = new DataStockDetail()
+ {
+ LotNo = modelpb.LotNo,
+ LotText = modelpb.LotText,
+ SupplierLot = modelpb.SupplierLot,
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ Standard = sku.Standard,
+ Qty = modelpb.Qty,
+ LockQty = 0,
+ FrozenQty = 0,
+ InspectQty = 0,
+ ASNNo = modelpb.ASNNo,
+ ASNDetailNo = modelpb.ASNDetailNo,
+ //WareHouseNo = locate.WareHouseNo,
+ //RoadwayNo = locate.RoadwayNo,
+ //AreaNo = locate.AreaNo,
+ //LocatNo = locate.LocatNo,
+ PalletNo = modelpb.PalletNo,
+ PalletNo2 = modelpb.PalletNo2,
+ PalletNo3 = modelpb.PalletNo3,
+ PalletTags = "0",
+ CompleteTime = datetime,
+ ProductionTime = modelpb.ProductionTime,
+ ExpirationTime = modelpb.ExpirationTime,
+ Status = "0",
+ InspectMark = modelpb.InspectMark,
+ InspectStatus = sku.IsInspect,
+ BitPalletMark = modelpb.BitPalletMark,
+ PackagNo = sku.PackagNo,
+ IsBale = modelpb.IsBale,
+ IsBelt = modelpb.IsBelt,
- // #endregion
+ IsDel = "0",
+ CreateUser = 0,
+ CreateTime = datetime
+ };
+ var sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+ #endregion
- // #region 娣诲姞浠诲姟
+ #region 搴撳瓨
+ var dataStock1 = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo);
+ if (dataStock1 != null)
+ {
+ dataStock1.Qty += modelpb.Qty;
+ if (modelpb.InspectMark == "1")
+ {
+ dataStock1.IsSampling = "0";
+ }
+ Db.Updateable(dataStock1).ExecuteCommand();
+ }
+ else
+ {
+ var stock = new DataStock()
+ {
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ Standard = sku.Standard,
+ LotNo = "",
+ LotText = "",
+ Qty = modelpb.Qty,
+ LockQty = 0,
+ FrozenQty = 0,
+ IsSampling = "0",
+ IsDel = "0",
+ CreateUser = 0,
+ CreateTime = datetime
+ };
+ Db.Insertable(stock).ExecuteCommand();
+ }
+ #endregion
- // //娣诲姞宸烽亾浣跨敤璁板綍
- // var log = new SysRoadwayUseLog
- // {
- // RoadwayNo = locateInfo.RoadwayNo,
- // WareHouseNo = houseNo,
- // Row = 0,
- // Column = 0,
- // Layer = 0,
- // };
- // Db.Insertable(log).ExecuteCommand();
- // var taskNo = new Common().GetMaxNo("TK");
- // var inTask = new LogTask //鍏ュ簱浠诲姟
- // {
- // TaskNo = taskNo,
- // Sender = "WMS",
- // Receiver = "WCS",
- // IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- // SendDate = DateTime.Now, //鍙戦�佹椂闂�
- // BackDate = DateTime.Now, //杩斿洖鏃堕棿
- // StartRoadway = "", // 璧峰宸烽亾
- // StartLocat = locate,//璧峰浣嶇疆
- // EndLocat = locateInfo.LocatNo,//鐩爣浣嶇疆
- // EndRoadway = locateInfo.RoadwayNo, // 鐩爣宸烽亾
- // PalletNo = palletNo,//鎵樼洏鐮�
- // IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- // IsCancel = 1,//鏄惁鍙彇娑�
- // IsFinish = 1,//鏄惁鍙畬鎴�
- // Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- // Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- // OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- // Msg = $"{locateInfo.LocatNo}鍒�=>>" + + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+ // 鏇存敼鎵樼洏浣跨敤鐘舵��
+ string sqlStr = string.Empty;
+ sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
+ Db.Ado.ExecuteCommand(sqlStr);
- // };
- // Db.Insertable(inTask).ExecuteCommand();
- // var asnNo = "";
+ #region 娣诲姞浠诲姟
+
+ //娣诲姞宸烽亾浣跨敤璁板綍
+ var log = new SysRoadwayUseLog
+ {
+ RoadwayNo = locate.RoadwayNo,
+ WareHouseNo = houseNo,
+ Row = 0,
+ Column = 0,
+ Layer = 0,
+ };
+ Db.Insertable(log).ExecuteCommand();
+ var taskNo = new Common().GetMaxNo("TK");
+ var inTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartRoadway = "", // 璧峰宸烽亾
+ StartLocat = Strlocate,//璧峰浣嶇疆
+ EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
+ PalletNo = palletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = $"{locateInfo.LocatNo}鍒�=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+ };
+ Db.Insertable(inTask).ExecuteCommand();
+ var asnNo = "";
+
+ //娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = inTask.TaskNo,
+ TraceNo = asnNo,
+ PalletNo = palletNo,
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ LotNo = "",
+ Status = "1",
+
+ WareHouseNo = houseNo,
+ RoadwayNo = locate.RoadwayNo,
+ AreaNo = locate.AreaNo,
+ LocatNo = locate.LocatNo,
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+
+
+
+ locate.Status = "2";
+ Db.Updateable(locate).ExecuteCommand();
+
+ var comDto = new OutCommandDto()
+ {
+ TaskNo = taskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷
+ PalletNo = palletNo,//鎵樼洏鍙�
+
+ StartRoadway = inTask.StartRoadway,
+ StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = inTask.EndRoadway, // 鐩爣宸烽亾
+ Qty = int.Parse(modelpb.Qty.ToString()),
+
+ Order = 999,
+ Type = PLCTypeEnum.AGV
+ };
+
+ #endregion
+
- // //娣诲姞鎵樼洏涓婃灦璁板綍
- // var upShelf = new BllPalletUpShelf()
- // {
- // TaskNo = inTask.TaskNo,
- // TraceNo = asnNo,
- // PalletNo = palletNo,
- // SkuNo = stockModel.SkuNo,
- // SkuName = stockModel.SkuName,
- // LotNo = stockModel.LotNo,
- // Status = "1",
+ Db.CommitTran();
- // WareHouseNo = houseNo,
- // RoadwayNo = locate.RoadwayNo,
- // AreaNo = locate.AreaNo,
- // LocatNo = locate.LocatNo,
+ #endregion
- // CreateUser = 0,
- // };
- // Db.Insertable(upShelf).ExecuteCommand();
-
-
-
- // locate.Status = "2";
- // Db.Updateable(locate).ExecuteCommand();
-
- // Db.CommitTran();
- // comDto = new OutCommandDto()
- // {
- // TaskNo = taskNo, // 浠诲姟鍙�
- // TaskType = "0",// 浠诲姟绫诲瀷
- // PalletNo = palletNo,//鎵樼洏鍙�
-
- // StartRoadway = inTask.StartRoadway,
- // StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
- // EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆
- // EndRoadway = inTask.EndRoadway, // 鐩爣宸烽亾
-
- // Order = 999,
- // Type = PLCTypeEnum.AGV
- // };
-
- // #endregion
-
- // // 鏇存敼鎵樼洏浣跨敤鐘舵��
- // string sqlStr = string.Empty;
- // sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
- // Db.Ado.ExecuteCommand(sqlStr);
- // Db.CommitTran();
-
- // #endregion
-
- // return null;
- //}
- //catch (Exception e )
- //{
- // throw new Exception(e.Message);
- //}
+ return comDto;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
}
@@ -709,18 +720,18 @@
//鎵樼洏搴撳瓨淇℃伅
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
- foreach (var item in stockDetail)
- {
- var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
- if (skuItem.SkuNo == "100099")
- {
- continue;
- }
- if (skuItem.Type != "2")
- {
- throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
- }
- }
+ //foreach (var item in stockDetail)
+ //{
+ // var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+ // if (skuItem.SkuNo == "100099")
+ // {
+ // continue;
+ // }
+ // if (skuItem.Type != "2")
+ // {
+ // throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+ // }
+ //}
var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
if (upShelfOld != null) //姝ｅ父鍏ュ簱
@@ -1016,18 +1027,18 @@
var oldTaskNo = ""; //鏃т换鍔″彿
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
//楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
- foreach (var item in stockDetail)
- {
- var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
- if (skuItem.SkuNo == "100099")
- {
- continue;
- }
- if (skuItem.Type != "2")
- {
- throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
- }
- }
+ //foreach (var item in stockDetail)
+ //{
+ // var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+ // if (skuItem.SkuNo == "100099")
+ // {
+ // continue;
+ // }
+ // if (skuItem.Type != "2")
+ // {
+ // throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+ // }
+ //}
var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
--
Gitblit v1.8.0