From 9335b068994ded46e7844d81967a12eb652f77ef Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:05:56 +0800
Subject: [PATCH] 处理出库作业手动分配无法输入小数问题

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index ae98c96..f0caa6c 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -151,8 +151,8 @@
                 {
                     throw new Exception("褰撳墠鐗╂枡鍖呰淇℃伅涓嶅瓨鍦紝璇锋牳瀹�!");
                 }
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+                var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺 
 
                 //鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
                 new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
@@ -1235,8 +1235,8 @@
                     throw new Exception("鏈煡璇㈠埌璇ョ墿鏂欏寘瑁呬俊鎭紝璇锋牳瀹烇紒");
                 }
 
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+                var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺 
                 //鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
                 new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
                  
@@ -1986,8 +1986,8 @@
                         var addComBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allotId).ToList();
                         var addComList = addComBox.GroupBy(m => m.BoxNo).ToList();
                         var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == addComBox.First().SkuNo);
-                        var pNum = 0;
-                        var bNum = 0;
+                        var pNum = 0m;
+                        var bNum = 0m;
                         new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
                         var boxList = new List<BllBoxInfo>();
                         foreach (var com in addComList)
@@ -2261,8 +2261,8 @@
                     throw new Exception($"鏈煡璇㈠埌鐗╂枡{obj.Data.SkuNo}淇℃伅");
                 }
 
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+                var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺 
                 //鑾峰彇鍖呰淇℃伅
                 new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
                 if (pNum == 0 || bNum == 0)
@@ -2692,8 +2692,8 @@
                 var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == boxInfoOne.SkuNo);
                 var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
 
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+                var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺 
 
                 //鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
                 new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -2958,8 +2958,8 @@
                  
                 var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == skuInfo.PackagNo);
 
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+                var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺 
 
                 //鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
                 new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -3305,8 +3305,8 @@
                 }
                 //鑾峰彇鎵樼洏淇℃伅
                 var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
-                var pNum = 0;
-                var bNum = 0;
+                var pNum = 0m;
+                var bNum = 0m;
 
                 new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
 
@@ -6297,6 +6297,10 @@
                 {
                     throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨锛岃鏍告煡!");
                 }
+                if (storageLocat.WareHouseNo != "W04")
+                {
+                    throw new Exception("璇ュ偍浣嶄笉鏄钩搴撳偍浣嶏紝璇锋鏌�!");
+                }
                 if (storageLocat.Status != "0")
                 { 
                     var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
@@ -6304,6 +6308,11 @@
                     {
                         throw new Exception("鍌ㄤ綅涓嶆槸绌洪棽鐘舵�侊紝璇锋牳鏌�!");
                     }
+                    var logIng = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.EndLocat == storageLocat.LocatNo && w.Status == "1" && w.PalletNo != model.PalletNo);
+                    if (logIng != null)
+                    {
+                        throw new Exception("璇ュ偍浣嶆湁姝e湪鎵ц鐨勫叆搴撲换鍔★紝璇锋牳鏌�!");
+                    }
                 }
                 #endregion
 

--
Gitblit v1.8.0