From a8eaf0a6432009e06b471bc965015e8ef2835b1d Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期六, 28 九月 2024 13:28:55 +0800
Subject: [PATCH] 修改申请空托出库方法
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 45 +++++++++++++++++++++++++++++++--------------
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 2 +-
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 7a2a466..161ce8e 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -2291,7 +2291,7 @@
SysStorageLocat locate;
var areaList = new List<string>();
- areaList.Add("A07");
+ areaList.Add("A03");
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
Db.BeginTran();
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 908c485..d8ff5f2 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1370,6 +1370,14 @@
#endregion
#region 娣诲姞绉诲簱浠诲姟淇℃伅
+ var stkModel = Db.Queryable<DataStockDetail>().First(m => m.LocatNo == slotBefore.LocatNo);
+ string PalletNo = "LN000000"; // 榛樿婕旂ず鎵樼洏
+ if (stkModel != null)
+ {
+ PalletNo = stkModel.PalletNo;
+ }
+ //鑾峰彇绉诲簱鐨勫簱浣�
+ var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, stkModel.SkuNo);
var taskNo = new Common().GetMaxNo("TK");
var exTask = new LogTask //鍑哄簱浠诲姟
@@ -1379,9 +1387,9 @@
Receiver = "PDA",
IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- StartLocat = locat == null ? "" : s.LocatNo,//璧峰浣嶇疆
- EndLocat = model.OutMode,//鐩爣浣嶇疆
- PalletNo = s.PalletNo,//鎵樼洏鐮�
+ StartLocat = stkModel.LocatNo,//璧峰浣嶇疆
+ EndLocat = newSlot,//鐩爣浣嶇疆
+ PalletNo = PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -1390,7 +1398,7 @@
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = serverTime, //鍒涘缓鏃堕棿
CreateUser = userId, //鍒涘缓浜�
- Msg = "Pda绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + model.OutMode + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "Pda绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + newSlot + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
//FinishDate = serverTime, //瀹屾垚鏃堕棿
};
moveDto.Add(new OutCommandDto()
@@ -1398,10 +1406,10 @@
PalletNo = exTask.PalletNo,//鎵樼洏鍙�
StartLocate = exTask.StartLocat, // 璧峰浣嶇疆
StartRoadway = locat.RoadwayNo, //鎵�灞炲贩閬�
- EndLocate = model.OutMode, // 鐩爣浣嶇疆
+ EndLocate = exTask.EndLocat, // 鐩爣浣嶇疆
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
TaskType = "2",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = model.OutMode, //鐩爣鍦板潃
+ OutMode = "", //鐩爣鍦板潃
Order = 1
});
Db.Insertable(exTask).ExecuteCommand();
@@ -1731,7 +1739,7 @@
}
////鏇存敼鍌ㄤ綅鐘舵�佷负鍑哄簱涓�
- //locat.Status = "3"; //3 鍑哄簱涓�
+ //locat.Status = "3"; // 1 鏈夌墿鍝�
//locat.UpdateTime = serverTime; //淇敼鏃堕棿
//locat.UpdateUser = userId; //淇敼浜�
////淇敼鍌ㄤ綅淇℃伅
@@ -2082,18 +2090,26 @@
#endregion
#region 娣诲姞绉诲簱浠诲姟淇℃伅
+ var stkModel = Db.Queryable<DataStockDetail>().First(m=>m.LocatNo == slotBefore.LocatNo);
+ string PalletNo = "LN000000"; // 榛樿婕旂ず鎵樼洏
+ if (stkModel != null)
+ {
+ PalletNo = stkModel.PalletNo;
+ }
+ //鑾峰彇绉诲簱鐨勫簱浣�
+ var newSlot = MoveAddress(slotBefore.LocatNo, slotBefore.RoadwayNo, stkModel.SkuNo);
var taskNo = new Common().GetMaxNo("TK");
- var exTask = new LogTask //鍑哄簱浠诲姟
+ var exTask = new LogTask // 绉诲簱浠诲姟
{
TaskNo = taskNo,
Sender = "WMS",
Receiver = "WCS",
IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- StartLocat = locat == null ? "" : s.LocatNo,//璧峰浣嶇疆
- EndLocat = model.OutMode,//鐩爣浣嶇疆
- PalletNo = s.PalletNo,//鎵樼洏鐮�
+ StartLocat = stkModel.LocatNo,//璧峰浣嶇疆
+ EndLocat = newSlot,//鐩爣浣嶇疆
+ PalletNo = PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -2102,7 +2118,7 @@
OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = serverTime, //鍒涘缓鏃堕棿
CreateUser = userId, //鍒涘缓浜�
- Msg = "WCS绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + model.OutMode + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
+ Msg = "WCS绌烘墭浠�" + locat == null ? "" : s.LocatNo + "鍒�" + newSlot + "鐨勭Щ搴撲换鍔�", //鍏抽敭淇℃伅
//FinishDate = serverTime, //瀹屾垚鏃堕棿
};
moveDto.Add(new OutCommandDto()
@@ -2110,10 +2126,10 @@
PalletNo = exTask.PalletNo,//鎵樼洏鍙�
StartLocate = exTask.StartLocat, // 璧峰浣嶇疆
StartRoadway = locat.RoadwayNo, //鎵�灞炲贩閬�
- EndLocate = model.OutMode, // 鐩爣浣嶇疆
+ EndLocate = exTask.EndLocat, // 鐩爣浣嶇疆
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
TaskType = "2",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = model.OutMode, //鐩爣鍦板潃
+ OutMode = "", //鐩爣鍦板潃
Order = 1
});
Db.Insertable(exTask).ExecuteCommand();
@@ -3300,6 +3316,7 @@
}
}
+
//鍙栨牱鍑哄簱鎷ｈ揣(鏃犳爣绛�)
public void SampleSoSetQtyPick(string soType, string soNo, string soDetailId, string palletNo, string PickQty, string asnNo, int userId)
{
--
Gitblit v1.8.0