From 98671d2b1473b1e3e55abbdd3304fc3cd8c33959 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 16 十月 2024 18:14:38 +0800
Subject: [PATCH] 修改问题

---
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 7ccaf70..ff2c8d6 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -539,7 +539,7 @@
                 {
                     var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暎鏀嫞璐с��2锛氭暟閲忔嫞璐�
                     List<DataBoxInfo> boxInfos;
-                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);
                     if (boxInfo.Count() == 0)
                     {
                         throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
@@ -653,6 +653,7 @@
 
                         if (biaoShi != "2")
                         {
+                            pickQty += item.Qty;
                             //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
                             Db.Deleteable(item).ExecuteCommand();
                         }
@@ -660,17 +661,20 @@
                         {
                             if (decimal.Parse(pickQty1) == item.Qty)
                             {
+                                pickQty += item.Qty;
                                 //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
                                 Db.Deleteable(item).ExecuteCommand();
+                                
                             }
                             else
                             {
+                                pickQty += decimal.Parse(pickQty1);
                                 item.Qty -= decimal.Parse(pickQty1);
                                 item.BitBoxMark = "1";//闆剁鏍囪瘑
                                 Db.Updateable(item).ExecuteCommand();
                             }
                         }
-                        pickQty += item.Qty;
+                        
                     }
                     //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
                     if (biaoShi == "1")
@@ -3230,6 +3234,7 @@
 
                         if (biaoShi != "2")
                         {
+                            pickQty += item.Qty;
                             //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
                             Db.Deleteable(item).ExecuteCommand();
                         }
@@ -3237,17 +3242,19 @@
                         {
                             if (decimal.Parse(pickQty1) == item.Qty)
                             {
+                                pickQty += item.Qty;
                                 //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
                                 Db.Deleteable(item).ExecuteCommand();
                             }
                             else
                             {
+                                pickQty += decimal.Parse(pickQty1);
                                 item.Qty -= decimal.Parse(pickQty1);
                                 item.BitBoxMark = "1";//闆剁鏍囪瘑
                                 Db.Updateable(item).ExecuteCommand();
                             }
                         }
-                        pickQty += item.Qty;
+                        
                     }
                     //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
                     if (biaoShi == "1")
@@ -4265,7 +4272,7 @@
                                         PalletNo3 = item.PalletNo3,
                                         Qty = decimal.Parse(pickQty1),
                                         FullQty = item.FullQty,
-                                        Status = "4",
+                                        Status = "5",
                                         LotNo = item.LotNo,
                                         LotText = item.LotText,
                                         SkuNo = item.SkuNo,

--
Gitblit v1.8.0