From 260c6e54c4f100ca49376a6afd70f73843868171 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 28 八月 2024 08:49:35 +0800
Subject: [PATCH] 组托收货测试

---
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 3a75010..5bd3412 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -960,6 +960,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 
@@ -1328,6 +1329,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 
@@ -1385,7 +1387,8 @@
         }
 
         //鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
-        public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
+        public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, 
+            string pickQty1, string asnNo, int userId)
         {
             Db.BeginTran();
             try
@@ -2025,6 +2028,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 
@@ -2497,6 +2501,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 
@@ -3032,6 +3037,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
         /// <summary>
@@ -3345,6 +3351,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
         #endregion
@@ -3389,7 +3396,7 @@
             var samplingQty = await Db.Queryable<BllSamplingDetails>().Where(m => m.IsDel == "0" && m.QcNo == qcNo).SumAsync(m => m.CompleteQty);
 
             data.QcNo = qcNo;
-            data.Sku = inspectionRequest.SkuNo;
+            data.Sku = inspectionRequest.SkuNo + "-" + inspectionRequest.SkuName;
             data.LotNo = inspectionRequest.LotNo;
             data.Qty = inspectionRequest.SamplingQty.ToString();
             data.SamplingQty = samplingQty == null ? "0" : samplingQty.ToString();
@@ -3855,6 +3862,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 
@@ -3899,14 +3907,20 @@
                     throw Oops.Bah("璇烽獙鍗曠姸鎬侀敊璇紝璇锋牳瀹�");
                 }
                 //搴撳瓨鏄庣粏淇℃伅
-                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
+                var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo 
+                && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
                 if (stockDetail == null)
                 {
                     throw Oops.Bah("鏈湪搴撳瓨涓煡璇㈠嚭褰撳墠鎵樼洏淇℃伅");
                 }
+                // 鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
                 if (!string.IsNullOrWhiteSpace(stockDetail.LocatNo))
                 {
-                    throw Oops.Bah("褰撳墠鎵樼洏涓嶆槸搴撳鎵樼洏锛岃鏍稿疄");
+                    var wareHouseData = await Db.Queryable<SysWareHouse>().FirstAsync(m => m.IsDel == "0" && m.WareHouseNo == stockDetail.WareHouseNo);
+                    if (wareHouseData.Type != "2") 
+                    {
+                        throw Oops.Bah("褰撳墠鎵樼洏涓嶆槸搴撳鎵樼洏锛岃鏍稿疄");
+                    }
                 }
                 //搴撳瓨鎬昏〃
                 var stock = await Db.Queryable<DataStock>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == inspecd.SkuNo && m.LotNo == inspecd.LotNo);
@@ -4033,8 +4047,6 @@
                 await Db.Updateable(inspecd).ExecuteCommandAsync();
                 #endregion
 
-
-
                 //娣诲姞鎿嶄綔鏃ュ織璁板綍
                 var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鍙栨牱鎷ｈ揣", qcNo, "鎷ｈ揣", $"鍦≒DA涓婂璇烽獙鍗曞彿涓猴細{qcNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
                 Db.CommitTran();
@@ -4042,6 +4054,7 @@
             catch (Exception e)
             {
                 Db.RollbackTran();
+                throw e;
             }
         }
 

--
Gitblit v1.8.0