From 9f3f798670e87b91c1b4c4d2b1c44bb850a34153 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 17:47:43 +0800
Subject: [PATCH] 车间退料入库质检状态默认合格

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 66196cd..515dc67 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -280,7 +280,7 @@
                         sd1 = new DataStockDetail()
                         {
                             LotNo = bind.LotNo,
-                            LotText = bind.LotText,
+                            //LotText = bind.LotText,
                             SupplierLot = bind.SupplierLot,
                             SkuNo = sku.SkuNo,
                             SkuName = sku.SkuName,
@@ -304,7 +304,7 @@
                             ExpirationTime = bind.ExpirationTime,
                             Status = "0",
                             InspectMark = bind.InspectMark,
-                            InspectStatus = sku.IsInspect,
+                            //InspectStatus = sku.IsInspect,
                             BitPalletMark = bind.BitPalletMark,
                             PackagNo = sku.PackagNo,
                             IsBale = bind.IsBale,
@@ -314,13 +314,28 @@
                             CreateUser = 0,
                             CreateTime = comTime
                         };
+
+                        //2025骞�12鏈�04鏃ョ敳鏂硅姹傗�滅敓浜ч��鏂欏叆搴撯�濋粯璁よ川妫�鍚堟牸
+                        if (notice.Type == "8")
+                        {
+                            sd1.InspectStatus = "1";
+                            sd1.LotText = "";
+                        }
+                        else
+                        {
+                            sd1.InspectStatus = sku.IsInspect;
+                            sd1.LotText = bind.LotText;
+                        }
+
+                        //鐢熶骇鏃ユ湡
                         if (!string.IsNullOrEmpty(detail.Lot1))
                         {
-                            sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//鐢熶骇鏃ユ湡
+                            sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);
                         }
+                        //鍒版湡鏃ユ湡
                         if (!string.IsNullOrEmpty(detail.Lot2))
                         {
-                            sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//鍒版湡鏃ユ湡
+                            sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);
                         }
                         var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
                         if (palletData != null)
@@ -428,7 +443,7 @@
                                 Standard = sku.Standard,
                                 ProductionTime = box.ProductionTime,
                                 SupplierLot = box.SupplierLot,
-                                InspectStatus = sku.IsInspect,
+                                //InspectStatus = sku.IsInspect,
                                 InspectMark = box.InspectMark,
                                 BitBoxMark = box.BitBoxMark,
                                 ExpirationTime = box.ExpirationTime,
@@ -436,6 +451,9 @@
                                 CreateUser = 0,
                                 CreateTime = comTime
                             };
+                            //2025骞�12鏈�04鏃ョ敳鏂硅姹傗�滅敓浜ч��鏂欏叆搴撯�濋粯璁よ川妫�鍚堟牸
+                            box2.InspectStatus = (notice.Type == "8") ? "1" : sku.IsInspect;
+
                             //娣诲姞搴撳瓨绠辩爜鏄庣粏
                             Db.Insertable(box2).ExecuteCommand();
                             #endregion

--
Gitblit v1.8.0