From 5cd6855d7cde48643c82ca9b05d00d7df6f1f936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=B9=8F?= <jp18752920760@163.com>
Date: Thu, 29 Jun 2023 17:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSManufactureService.cs                   | 18 +++++++++++-------
 .../ICSWareHouseLotInfoService.cs              | 13 ++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
index 5922202..c222d66 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
@@ -723,15 +723,18 @@ namespace ICSSoft.DataProject
             try
             {
                 string sql = @"
-                                IF NOT EXISTS(SELECT 1
-	                                FROM ICSMO a
-	                                LEFT JOIN ICSInventoryLotDetail b ON b.TransCode=a.MoCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
-	                                LEFT JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
-	                                LEFT JOIN ICSExtension d ON d.ID=c.ExtensionID AND d.WorkPoint=c.WorkPoint
-	                                LEFT JOIN ICSBackflushBCLog	bclog ON a.MOCode=bclog.TransCode AND a.Sequence=bclog.TransSequence AND bclog.BatchCode=d.BatchCode
-	                                WHERE c.LotNo='{0}')
+                                IF NOT EXISTS (
+                                    SELECT bcLog.ID
+                                    FROM ICSMO a
+                                    INNER JOIN ICSInventoryLotDetail b ON b.TransCode=a.MoCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
+                                    INNER JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
+                                    INNER JOIN ICSExtension d ON d.ID=c.ExtensionID AND d.WorkPoint=c.WorkPoint
+                                    INNER JOIN ICSBackflushBCLog bclog ON a.MOCode=bclog.TransCode AND a.Sequence=bclog.TransSequence AND bclog.BatchCode=d.BatchCode
+                                    WHERE c.LotNo = '{0}'
+                                )
                                 BEGIN
 	                                RAISERROR('" + language.GetNameByCode("WMSAPIInfo468") + @"',16,1);
+	                                RETURN;
                                 END
 
                                 DECLARE @Status VARCHAR(10)
@@ -763,6 +766,7 @@ namespace ICSSoft.DataProject
 	                                RAISERROR('" + language.GetNameByCode("WMSAPIInfo083") + @"',16,1);
                                 END";
                 sql = string.Format(sql, LotNo, WorkPoint, Quantity);
+                log.Debug("生产入库：" + sql);
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))
                 {
                     throw new Exception(language.GetNameByCode("WMSAPIInfo136"));//"生产订单更新失败！");
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 4c18a92..0a9c5d3 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -71,10 +71,10 @@ namespace ICSSoft.DataProject
                 sql += @"
                             IF NOT EXISTS(SELECT 1
 	                            FROM ICSMO a
-	                            LEFT JOIN ICSInventoryLotDetail b ON b.TransCode=a.MoCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
-	                            LEFT JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
-	                            LEFT JOIN ICSExtension d ON d.ID=c.ExtensionID AND d.WorkPoint=c.WorkPoint
-	                            LEFT JOIN ICSBackflushBCLog	bclog ON a.MOCode=bclog.TransCode AND a.Sequence=bclog.TransSequence AND bclog.BatchCode=d.BatchCode
+	                            INNER JOIN ICSInventoryLotDetail b ON b.TransCode=a.MoCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
+	                            INNER JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
+	                            INNER JOIN ICSExtension d ON d.ID=c.ExtensionID AND d.WorkPoint=c.WorkPoint
+	                            INNER JOIN ICSBackflushBCLog	bclog ON a.MOCode=bclog.TransCode AND a.Sequence=bclog.TransSequence AND bclog.BatchCode=d.BatchCode
 	                            WHERE c.LotNo='{0}')
                             BEGIN
 	                            RAISERROR('" + language.GetNameByCode("WMSAPIInfo468") + @"',16,1);
@@ -86,9 +86,12 @@ namespace ICSSoft.DataProject
                             RETURN
                         END
 
+                        UPDATE ICSInventoryLot SET Quantity = '{3}' WHERE LotNo='{0}' AND WorkPoint = '{1}'
+
                         IF EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}')
                         BEGIN
-	                        UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)+'{3}' WHERE LotNo='{0}' AND WorkPoint='{1}'
+	                        -- UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)+'{3}' WHERE LotNo='{0}' AND WorkPoint='{1}'
+                            UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL({3},0) WHERE LotNo='{0}' AND WorkPoint='{1}'
                         END
                         ELSE
                         BEGIN