From 3a89a0b435821e074e781e5eb9eaebae16de01d6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 24 八月 2024 16:28:36 +0800
Subject: [PATCH] PDA组托页面和平库入库托盘上架

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 27ac2ea..bed4f60 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -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