From 0ac24686e0ea025e499f7055d591bc1251bbb3f5 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 06 三月 2024 09:10:38 +0800
Subject: [PATCH] 出库流程问题修改

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 909e6a3..1c6e0ff 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -224,7 +224,7 @@
                     {
                         SkuNo = d.SkuNo,
                         LotNo = d.LotNo,
-                        Qty = int.Parse(d.CompleteQty.ToString())
+                        Qty = (decimal)d.CompleteQty
                     };
                     list.Add(item);
                 }
@@ -247,8 +247,8 @@
                 #endregion
 
                 notice.Status = "6";
-                notice.UpdateTime = DateTime.Now;
-                notice.UpdateUser = userId;
+                notice.CheckTime = DateTime.Now;
+                notice.CheckUser = userId;
                 Db.Updateable(notice).ExecuteCommand();
 
                 new OperationSOServer().AddLogOperationSo("鍑哄簱浣滀笟", "鍑哄簱鍗曟嵁", notice.SONo, "澶嶆牳", $"澶嶆牳浜嗗崟鎹彿涓簕notice.SONo}鐨勫崟鎹俊鎭�", userId);
@@ -360,6 +360,9 @@
                         break;
                     case "6"://浠ｅ偍鍑哄簱
                         skuType = "(2)";
+                        break;
+                    case "8"://瀵勫瓨鍑哄簱
+                        skuType = "(3)";
                         break;
                     default: //鍏跺畠鍑哄簱
                         skuType = "(0,1,2,3,4)";
@@ -1418,8 +1421,8 @@
                     foreach (var item in list)
                     {
                         string toLocation = string.Empty;//鐩爣浣嶇疆
+                        string unstackingMode2 = unstackingMode;//鎷嗗灈鏂瑰紡锛�0:鏈哄櫒浜烘媶鍨� 1:PDA鎷嗗灈
                         #region 鍒ゆ柇鏄惁闇�瑕佹媶绠�
-                        string isChai = "0";//鏄惁闇�瑕佹媶绠憋紝0:涓嶉渶瑕�  1:闇�瑕�
                         var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
                         if (skuInfo == null)
                         {
@@ -1434,12 +1437,11 @@
                         {
                             if (item.Qty % (decimal)packagInfo.L2Num != 0)//鑳芥暣闄よ鏄庝笉鐢ㄦ媶绠憋紝涓嶈兘鏁撮櫎璇存槑闇�瑕佹媶绠�
                             {
-                                isChai = "1";//闇�瑕佹媶绠�
-                                unstackingMode = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
+                                unstackingMode2 = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
                             }
                         }
                         #endregion
-                        if (unstackingMode == "0")//鏈哄櫒浜烘媶鍨�
+                        if (unstackingMode2 == "0")//鏈哄櫒浜烘媶鍨�
                         {
                             toLocation = loadingAddre;//瑁呰溅鍙�
                         }
@@ -1555,7 +1557,7 @@
                                 Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
                                 Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
                                 OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
-                                Msg = "浠�" + locate.LocatNo + "鍒�" + outMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
+                                Msg = "浠�" + locate.LocatNo + "鍒�" + toLocation + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
                             };
                             Db.Insertable(exTask).ExecuteCommand();
                             logTaskList.Add(exTask);
@@ -1599,9 +1601,9 @@
 
                             item.TaskNo = exTask.TaskNo; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
                             item.Status = "1"; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛� 
-                            item.UnstackingMode = unstackingMode;//鎷嗗灈鏂瑰紡
-                            item.OutMode = unstackingMode == "1" ? outMode : "";//鍑哄簱鍙�
-                            item.LoadingAddre = unstackingMode == "0" ? loadingAddre : "";//瑁呰溅鍙�
+                            item.UnstackingMode = unstackingMode2;//鎷嗗灈鏂瑰紡
+                            item.OutMode = unstackingMode2 == "1" ? outMode : "";//鍑哄簱鍙�
+                            item.LoadingAddre = unstackingMode2 == "0" ? loadingAddre : "";//瑁呰溅鍙�
                             Db.Updateable(item).ExecuteCommand();
 
                             #endregion
@@ -1643,8 +1645,8 @@
                             }
                             item.TaskNo = taskNo.TaskNo;
                             item.Status = "1"; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛� 
-                            item.OutMode = unstackingMode == "1" ? taskNo.EndLocat : "";//鍑哄簱鍙�
-                            item.LoadingAddre = unstackingMode == "0" ? taskNo.EndLocat : "";//瑁呰溅鍙�
+                            item.OutMode = unstackingMode2 == "1" ? taskNo.EndLocat : "";//鍑哄簱鍙�
+                            item.LoadingAddre = unstackingMode2 == "0" ? taskNo.EndLocat : "";//瑁呰溅鍙�
                             Db.Updateable(item).ExecuteCommand();
                             flagList.Add(0);
                             #endregion
@@ -2610,6 +2612,7 @@
                     LocatNo = a.LocatNo,
                     RoadwayNo = a.RoadwayNo,
                     PalletNo = a.PalletNo,
+                    Demo = a.Demo,
                 }).ToList();
 
                 return list;

--
Gitblit v1.8.0