From 004930d6bfd4ce6447d2da09a0c72fd049693469 Mon Sep 17 00:00:00 2001
From: CatMaoo <1205395967@qq.com>
Date: Thu, 15 May 2025 15:08:51 +0800
Subject: [PATCH] 1

---
 .../ICSSoft.DataProject/ICSSubmitService.cs   | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 65d1ab9..3698faf 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -16545,7 +16545,7 @@ a.ExtensionID
                             #region 原条码
                             if (ScanType == "LOTNO")
                             {
-                                sql = sql + @" AND log.BusinessCode IN('" + type + @"') and log.TransCode='{6}' and log.TransSequence like '{7}~%'  GROUP BY a.quantity,log.FromWarehouseCode,log.FromLocationCode,inv.AmountEnable,inv.LotEnable,log.ID,a.ID,con.ContainerCode,con.ContainerName,a.LotNo,a.InvCode,inv.InvName,inv.InvStd,inv.InvUnit,a.WarehouseCode,
+                                sql = sql + @" AND log.BusinessCode IN('" + type + @"') and log.TransCode='{6}' and log.TransSequence like '{7}~%'  GROUP BY a.WorkPoint,a.quantity,log.FromWarehouseCode,log.FromLocationCode,inv.AmountEnable,inv.LotEnable,log.ID,a.ID,con.ContainerCode,con.ContainerName,a.LotNo,a.InvCode,inv.InvName,inv.InvStd,inv.InvUnit,a.WarehouseCode,
                                 wh.WarehouseName,a.LocationCode,loc.LocationName,CASE WHEN(invBat.BatchEnable IS NULL AND ISNULL(inv.BatchEnable, '0')= '1') OR ISNULL(invBat.BatchEnable, '0')= '1' THEN ISNULL(ext.BatchCode, '') ELSE '' END,inv.AmountUnit,
                                 ext.ID,ext.ProjectCode,ext.Version,ext.Brand,ext.cFree1,ext.cFree2,ext.cFree3,ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10,a.MUSER,a.MTIME
                                 ";
@@ -16567,14 +16567,33 @@ a.ExtensionID
                                 //END
                                 //" + sql;
 
-                                columns = @"SUM(log.Quantity) AS Quantity,a.quantity as InfoQuantity,
+                                columns = @"SUM(log.Quantity) AS SumQuantity,a.quantity as InfoQuantity,
                                     SUM(log.Quantity*(lot.Amount/lot.Quantity)) AS Amount,log.FromWarehouseCode,log.FromLocationCode,
                                     case when log.FromLocationCode=a.LocationCode then '0' else '1' end Flag,
                                     a.WarehouseCode AS WHCode,
                                     wh.WarehouseName AS WHName,
                                     a.LocationCode,
                                     loc.LocationName,
-                                    log.ID AS LogID,
+                                    STUFF((
+                                        SELECT ', ' + CAST(log2.ID AS VARCHAR(50))
+                                        FROM ICSWareHouseLotInfoLog log2
+                                        WHERE log2.LotNo = a.LotNo 
+                                          AND log2.WorkPoint = a.WorkPoint
+                                          AND log2.BusinessCode IN('" + type + @"')
+                                          AND log2.TransCode='{6}' 
+                                          AND log2.TransSequence like '{7}~%'
+                                        FOR XML PATH('')
+                                    ), 1, 2, '') AS LogID,
+                                    STUFF((
+                                        SELECT ', ' + CAST(log2.Quantity AS VARCHAR(50))
+                                        FROM ICSWareHouseLotInfoLog log2
+                                        WHERE log2.LotNo = a.LotNo 
+                                          AND log2.WorkPoint = a.WorkPoint
+                                          AND log2.BusinessCode IN('13') 
+                                          AND log2.TransCode='{6}' 
+                                          AND log2.TransSequence like '{7}~%'
+                                        FOR XML PATH('')
+                                    ), 1, 2, '') AS Quantity,
                                     CASE WHEN (invBat.BatchEnable IS NULL AND ISNULL(inv.BatchEnable, '0')='1') OR ISNULL(invBat.BatchEnable, '0')='1' THEN ISNULL(ext.BatchCode, '') ELSE '' END AS BatchCode,";
 
                                 tableName = @"ICSWareHouseLotInfoLog log
@@ -16587,7 +16606,7 @@ a.ExtensionID
                             }
                             else
                             {
-                                sql = sql + @" AND log.BusinessCode IN('" + type + @"')  and log.TransCode='{6}' and log.TransSequence like '{7}~%' GROUP BY a.quantity,log.FromWarehouseCode,log.FromLocationCode,inv.AmountEnable,inv.LotEnable,log.ID,a.ID,con.ContainerCode,con.ContainerName,a.LotNo,a.InvCode,inv.InvName,inv.InvStd,inv.InvUnit,a.WarehouseCode,
+                                sql = sql + @" AND log.BusinessCode IN('" + type + @"')  and log.TransCode='{6}' and log.TransSequence like '{7}~%' GROUP BY a.WorkPoint,a.quantity,log.FromWarehouseCode,log.FromLocationCode,inv.AmountEnable,inv.LotEnable,log.ID,a.ID,con.ContainerCode,con.ContainerName,a.LotNo,a.InvCode,inv.InvName,inv.InvStd,inv.InvUnit,a.WarehouseCode,
                                 wh.WarehouseName,a.LocationCode,loc.LocationName,CASE WHEN(invBat.BatchEnable IS NULL AND ISNULL(inv.BatchEnable, '0')= '1') OR ISNULL(invBat.BatchEnable, '0')= '1' THEN ISNULL(ext.BatchCode, '') ELSE '' END,inv.AmountUnit,
                                 ext.ID,ext.ProjectCode,ext.Version,ext.Brand,ext.cFree1,ext.cFree2,ext.cFree3,ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10,a.MUSER,a.MTIME
                                 ";