From f147cfa91feec613eb304c78fecafdf43286034a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 30 三月 2024 11:12:24 +0800
Subject: [PATCH] Merge branch 'wxw'

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 81ab6c3..2a58636 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -324,7 +324,7 @@
                     PalletNo3 = model.PalletNo3,
                     Status = "1",
                     CompleteTime = DateTime.Now,
-                    Qty = (int)model.Qty,
+                    Qty = (decimal)model.Qty,
                     FullQty = null,
                     SkuNo = "100099",
                     SkuName = "鎵樼洏",
@@ -415,7 +415,7 @@
                     UpbindPalletNo = upBindPalletNo,
                     PalletNo2 = bindVms[0].PalletNo2,
                     PalletNo3 = bindVms[0].PalletNo3,
-                    Qty = (int)bindVms[0].Qty,
+                    Qty = bindVms[0].Qty,
                     LotNo = bindVms[0].LotNo,
                     LotText = bindVms[0].LotText,
                     SupplierLot = bindVms[0].SupplierLot,
@@ -801,7 +801,7 @@
                             return strMsg;
                         }
                         #endregion
-                        var pallQty = 0;//鎵樼洏涓婃暟閲�
+                        decimal pallQty = 0;//鎵樼洏涓婃暟閲�
                         var boxinfo2 = boxinfo.Where(w => w.SkuNo == noticeItem.SkuNo && w.LotNo == noticeItem.LotNo && w.PalletNo == model.PalletNo).ToList();
                         if (boxinfo2.Count <= 0)
                         {
@@ -1402,7 +1402,7 @@
                 {
                     throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
                 }
-                var bNum = 0;//鏁伴噺
+                decimal bNum = 0;//鏁伴噺
                 //楠岃瘉绠辩爜鏄惁宸茬粦瀹氭墭鐩�
                 foreach (var item in boxinfo)
                 {
@@ -2090,7 +2090,7 @@
                     var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
                     foreach (var g in boxGroup)
                     {
-                        var boxFullQty = 0;//绠卞唴鎬绘暟閲�
+                        decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
                         foreach (var box in g)
                         {
                             if (box.BindNo != null && box.BindNo != 0)
@@ -2196,10 +2196,10 @@
             try
             {
                 #region 楠岃瘉淇℃伅
-                if (string.IsNullOrEmpty(model.ASNNo))
-                {
-                    throw new Exception("鍏ュ簱鍗曚笉鑳戒负绌�!");
-                }
+                //if (string.IsNullOrEmpty(model.ASNNo))
+                //{
+                //    throw new Exception("鍏ュ簱鍗曚笉鑳戒负绌�!");
+                //}
                 if (string.IsNullOrEmpty(model.PalletNo))
                 {
                     throw new Exception("鎵樼洏鏉＄爜涓嶈兘涓虹┖!");
@@ -2591,7 +2591,7 @@
                         IsFinish = 0,//鏄惁鍙畬鎴�
                         Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
                         Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
-                        OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                        OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
                         Msg = "鍔涜骞冲簱鐨勫洖搴撲换鍔�",
                     };
                     Db.Insertable(exTask).ExecuteCommand();
@@ -2603,8 +2603,14 @@
                 //淇敼鍌ㄤ綅淇℃伅                                        
                 Db.Updateable(storageLocat).ExecuteCommand();
 
-                new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
-
+                if (iscount == 1)
+                {
+                    new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愭墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳洖娴佸叆搴撴搷浣�", (int)model.CreateUser);
+                }
+                else
+                {
+                    new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
+                }
                 Db.CommitTran();
             }
             catch (Exception ex)

--
Gitblit v1.8.0