From 6ac4b8a2fcd1043bc66f53bdf28c9ee00b8a57d0 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 26 八月 2024 08:33:17 +0800
Subject: [PATCH] 删除盘点修改
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 3b1572c..bed4f60 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -3530,7 +3530,7 @@
//缁戝畾绠辨�绘暟閲�
//model.SkuQty = boxInfoList.Sum(s => s.Qty);
//鍜岄�夋嫨鐨勬壒娆″悓鎵规鐨勭鐮佷俊鎭�
- var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo).ToList();
+ var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
//鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆＄殑绠辩爜淇℃伅锛堟嫾绠辨壒娆★級
var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
#endregion
@@ -5153,7 +5153,7 @@
SendDate = serverTime, //鍙戦�佹椂闂�
BackDate = serverTime, //杩斿洖鏃堕棿
StartLocat = "",//璧峰浣嶇疆
- EndLocat = "鍔涜骞冲簱",//鐩爣浣嶇疆
+ EndLocat = "骞冲簱",//鐩爣浣嶇疆
PalletNo = bindInfo.PalletNo,//鎵樼洏鐮�
IsSend = 0,//鏄惁鍙啀娆′笅鍙�
IsCancel = 0,//鏄惁鍙彇娑�
@@ -5161,7 +5161,7 @@
Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鍔涜骞冲簱鐨勫叆搴撲换鍔�",
+ Msg = "骞冲簱鐨勫叆搴撲换鍔�",
};
Db.Insertable(exTask).ExecuteCommand();
@@ -5175,6 +5175,27 @@
bindInfo.TaskNo = taskNo; //浠诲姟鍙�
Db.Updateable(bindInfo).ExecuteCommand();
#endregion
+
+ /* #region 娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = bindInfo.ASNNo,
+ PalletNo = bindInfo.PalletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
+
+ WareHouseNo = bindInfo.WareHouseNo,
+ RoadwayNo = bindInfo.RoadwayNo,
+ AreaNo = "",
+ LocatNo = "",
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ #endregion*/
#region 搴撳瓨绠辨敮鏄庣粏琛�
// 鎻掑叆鏂扮粍鐨勭鏀俊鎭�
@@ -5271,7 +5292,7 @@
SendDate = DateTime.Now, //鍙戦�佹椂闂�
BackDate = DateTime.Now, //杩斿洖鏃堕棿
StartLocat = "",//璧峰浣嶇疆
- EndLocat = "鐗у師骞冲簱",//鐩爣浣嶇疆
+ EndLocat = "骞冲簱",//鐩爣浣嶇疆
PalletNo = model.PalletNo,//鎵樼洏鐮�
IsSend = 0,//鏄惁鍙啀娆′笅鍙�
IsCancel = 0,//鏄惁鍙彇娑�
@@ -5279,7 +5300,7 @@
Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鐗у師骞冲簱鐨勫叆搴撲换鍔�",
+ Msg = "骞冲簱鐨勫叆搴撲换鍔�",
};
Db.Insertable(exTask).ExecuteCommand();
//鎵樼洏缁戝畾淇℃伅
@@ -5295,6 +5316,27 @@
Db.Updateable(bindInfo).ExecuteCommand();
}
#endregion
+
+ #region 娣诲姞鎵樼洏涓婃灦璁板綍
+ var palletupinfo = stockDetail.First();
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = bindInfo.ASNNo,
+ PalletNo = bindInfo.PalletNo,
+ SkuNo = palletupinfo.SkuNo,
+ SkuName = palletupinfo.SkuName,
+ LotNo = palletupinfo.LotNo,
+ Status = "2",
+ LocatNo = model.LocatNo,
+ WareHouseNo = bindInfo.WareHouseNo,
+ RoadwayNo = bindInfo.RoadwayNo,
+ AreaNo = storageLocat.AreaNo,
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ #endregion
}
storageLocat.Status = "1";//鐘舵�佸凡浣跨敤
storageLocat.UpdateTime = serverTime; //淇敼鏃堕棿
--
Gitblit v1.8.0