From d23a39640f1e2d554745e12d9429b3ca891699c1 Mon Sep 17 00:00:00 2001
From: FoxV <jp18752920760@163.com>
Date: Tue, 27 Sep 2022 10:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=99=E5=93=81=E7=AE=A1=E6=8E=A7=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=90=88=E6=89=B9=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSWareHouseLotInfoService.cs             | 55 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 2a264c3..7e1cbe2 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -552,12 +552,61 @@ namespace ICSSoft.DataProject
                             throw new Exception(language.GetNameByCode("WMSAPIInfo166"));
                         }
                     }
-                    //当存在料品管控条码时，执行合批
+                    //当存在料品管控条码时，直接将数量叠加
                     else
                     {
-                        LotNoMode lotNoMode = modelNew[0];
-                        WareHouseLotInfoMerge(Identification,jointLotNo, LotNo, Quantity,User,WorkPoint,TransType,BusinessCode,cmd,language);
+                        try
+                        {
+                            ///更新目标条码库存
+                            sql = @"
+                            IF NOT EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}')
+                            BEGIN
+	                            RAISERROR('" + language.GetNameByCode("WMSAPIInfo171") + @"',16,1);
+                                RETURN
+                            END
+                            UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)+'{2}' WHERE LotNo='{0}' AND WorkPoint='{1}'
+                            ";
+                            sql = string.Format(sql, jointLotNo, WorkPoint, Quantity);
+
+                            if (!DBHelper.ExecuteNonQuery(sql, cmd))
+                            {
+                                throw new Exception(language.GetNameByCode("WMSAPIInfo169"));//"目标条码库存更新失败！");
+                            }
+                            
+                            ///添加日志
+                            sql = @"IF NOT EXISTS(SELECT F_Account FROM Sys_SRM_User WHERE F_Account='{2}' AND F_Location='{1}')
+                        BEGIN
+	                        RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo060"), "{2}") + @"',16,1);
+                            RETURN
+                        END
+
+                        INSERT INTO ICSWareHouseLotInfoLog(ID,Identification,TransCode,TransSequence,LotNo,InvCode,
+                        FromWarehouseCode,FromLocationCode,ToWarehouseCode,ToLocationCode,Quantity,
+                        Memo,Lock,TransType,BusinessCode,ERPUpload,ERPID,
+                        ERPDetailID,ERPCode,ERPSequence,MUSER,MUSERName,
+                        MTIME,WorkPoint,EATTRIBUTE1)
+                        SELECT NEWID(),'{3}',b.TransCode,b.TransSequence,a.LotNo ,a.InvCode ,
+                        '','',c.WarehouseCode,c.LocationCode,c.Quantity,
+                        '','0','{4}','{5}','0','',
+                        '','','',f.F_Account ,f.F_RealName ,
+                        SYSDATETIME() ,a.WorkPoint ,''
+                        FROM ICSInventoryLot a
+                        INNER JOIN ICSInventoryLotDetail b ON a.LotNo=b.LotNo AND a.WorkPoint=b.WorkPoint
+                        INNER JOIN ICSWareHouseLotInfo c ON a.LotNo=c.LotNo AND a.WorkPoint=c.WorkPoint
+                        INNER JOIN Sys_SRM_User f ON f.F_Account='{2}' AND a.WorkPoint=f.F_Location
+                        WHERE a.LotNo='{0}' AND a.WorkPoint='{1}'
+                        ";
+                            sql = string.Format(sql, jointLotNo, WorkPoint, User, Identification, TransType, BusinessCode);
 
+                            if (!DBHelper.ExecuteNonQuery(sql, cmd))
+                            {
+                                throw new Exception(language.GetNameByCode("WMSAPIInfo166"));
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            throw;
+                        }
                     }