From 6ed99bd95c09fc24a28a260014a95e022b050941 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 04 七月 2024 10:16:16 +0800
Subject: [PATCH] 增加出库合格判断

---
 Wms/WMS.BLL/BllTransServer/RcsServer.cs |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index eff7a95..bd8aed5 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -86,9 +86,9 @@
                             throw new Exception("璇ユ壒娆℃病鏈夊搴旂殑鍑哄簱鍗�");
                         }
                         noticeno = bllSo.Id.ToString();
-                        //鏌ユ壘搴撳瓨涓槸鍚︽湁姝ゆ壒娆$殑涓嬫枡妗�
+                        //鏌ユ壘搴撳瓨涓槸鍚︽湁姝ゆ壒娆$殑鍚堟牸涓嬫枡妗�
                         sql = $@"select PalletNo,LocatNo from DataStockDetail where LotNo = '{pallnetmsg.LotNo}'and AreaNo like '%03' 
-                                    and WareHouseNo = '{house}' and status = '0' and PalletStatus = '2' order by CompleteTime desc";
+                                    and WareHouseNo = '{house}' and status = '0' and PalletStatus = '2' and InspectStatus = '1' order by CompleteTime desc";
                         pallet = Db.Ado.SqlQuery<DataStockDetail>(sql).FirstOrDefault();
                         if (pallet == null)
                         {
@@ -482,7 +482,7 @@
                 {
                     ordertype = "1";
                     sql = $"UPDATE BllExportNotice SET Status ='1' " +
-                        $"where asnno = (select ASNNO from BllExportNoticeDetail where id = {taskDetial.Noticedetailno})";
+                        $"where SoNO = (select SoNO from BllExportNoticeDetail where id = {taskDetial.Noticedetailno})";
                     Db.Ado.ExecuteCommand(sql);
                 }
                 else if(taskDetial.Type =="2" && taskDetial.Crtype == "0")//鍗婃垚鍝佸叆搴�
@@ -495,6 +495,12 @@
                     //搴撳瓨涓坊鍔犳鎵樼洏鐗╂枡缂栫爜鍜岀紪鐮佸悕绉�
                     sql2 = $"UPDATE DataStockDetail SET SkuNo = '{ArrivalMsg.SkuNo}',SkuName = '{ArrivalMsg.SkuName}' " +
                         $"where PalletNo = '{taskDetial.Pallno}'and LotNo = '{taskDetial.LotNo}'";
+                    Db.Ado.ExecuteCommand(sql2);
+                }
+                else if (taskDetial.Type == "1" && taskDetial.Crtype == "0")//棰勬贩妗跺叆搴�
+                {
+                    //棰勬贩妗跺叆搴撴椂娣诲姞鍒板簱瀛樹腑姝ゆ墭鐩樼殑鎵规淇℃伅
+                    sql2 = $"UPDATE DataStockDetail SET LotNo =  '{taskDetial.LotNo}' where PalletNo = '{taskDetial.Pallno}'";
                     Db.Ado.ExecuteCommand(sql2);
                 }
                 
@@ -550,7 +556,7 @@
                     sql = $"UPDATE SysStorageLocat SET Status = '2' where LocatNo = '{taskDetial.Endport}'";
                     if (taskDetial.Type == "2")
                     {
-                        sql2 = $"UPDATE DataStockDetail SET PalletStatus = '{taskDetial.Type}',LotNo = '{taskDetial.LotNo}' " +
+                        sql2 = $"UPDATE DataStockDetail SET PalletStatus = '{taskDetial.Type}'" +
                         $"where PalletNo = '{taskDetial.Pallno}'";
                         Db.Ado.ExecuteCommand(sql2);
                     }

--
Gitblit v1.8.0