From 02644f75ebea3aca052fb87df8be4f58b77ebcd5 Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Tue, 10 Sep 2024 10:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20=E8=8E=B7=E5=8F=96=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=97=B6=20=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=BC=80=E5=90=AF=E8=BE=85=E8=AE=A1=E9=87=8F=20?=
 =?UTF-8?q?=E5=A6=82=E6=98=AF=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95=E5=AD=90?=
 =?UTF-8?q?=E4=BB=B6=E6=B1=87=E6=80=BB=E7=9A=84=E6=9C=80=E5=B0=8F=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B*=E8=BE=85=E8=AE=A1=E9=87=8F=20=20=20=20=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=88=99*=E4=B8=BB=E8=AE=A1=E9=87=8F=20=20?=
 =?UTF-8?q?=20=20=E5=B7=A5=E5=8D=95=E6=88=90=E5=93=81=E4=B8=8E=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AD=90=E4=BB=B6=E6=9D=A1=E7=A0=81=E5=B7=B2=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=95=B0=E9=87=8F=E5=88=86=E5=BC=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs b/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
index b682533..dbda906 100644
--- a/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
+++ b/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
@@ -584,7 +584,7 @@ a.InvCode,b.InvName,b.ClassCode,b.InvStd,b.InvUnit, a.Quantity as Quantity,
 9999 as  AbsolveQty,
 cast( isnull(h.BL,0)*a.Amount AS DECIMAL(18,4))  as  AbsolveAmount,
 cast( isnull(c.LOTQTY,0)+isnull(f.GDQTY,0) as DECIMAL(18,4)) as CreatedQty,
-CAST( ((isnull(h.BL,0)*a.Amount) -(isnull(c.LOTQTY,0)+isnull(f.GDQTY,0))) as DECIMAL(18,4)) as  thisCreateQty,
+CAST( ((isnull(h.BL,0)* case when b.AmountEnable='1' then a.Amount else a.Quantity end) -(isnull(c.LOTQTY,0)+isnull(f.GDQTY,0))) as DECIMAL(18,4)) as  thisCreateQty,
 cast( a.Amount as DECIMAL(18,4)) as Amount,
 isnull(b.EffectiveEnable,0) as EffectiveEnable, 
 cast( isnull(b.EffectiveDays,0) as DECIMAL(18,4)) as EffectiveDays 
@@ -605,7 +605,7 @@ where isnull(a.EATTRIBUTE1,'')=''
             left join ICSInventoryLotDetail b on a.LotNo=b.LotNo and a.Type='3'
             where isnull(a.EATTRIBUTE1,'')=''
 			group by b.TransCode,b.TransSequence
-			) f on d.MOCode=f.TransCode and d.Sequence=f.TransSequence
+			) f on d.MOCode=f.TransCode and d.Sequence+'~'+a.Sequence=f.TransSequence
 			left join 
 (select  case when Flag>0 then ( case when PSLNUM>MLNUM then MLNUM else PSLNUM  end) else PSLNUM end as BL ,MODetailID from (
 select a.MODetailID,
@@ -637,7 +637,7 @@ a.InvCode,b.InvName,b.ClassCode,b.InvStd,b.InvUnit, a.Quantity as Quantity,
 9999 as  AbsolveQty,
 cast( isnull(h.BL,0)*a.Amount AS DECIMAL(18,4))  as  AbsolveAmount,
 cast( isnull(c.LOTQTY,0)+isnull(f.GDQTY,0) as DECIMAL(18,4)) as CreatedQty,
-CAST( ((isnull(h.BL,0)*a.Amount) -(isnull(c.LOTQTY,0)+isnull(f.GDQTY,0))) as DECIMAL(18,4)) as  thisCreateQty,
+CAST( ((isnull(h.BL,0)* case when b.AmountEnable='1' then a.Amount else a.Quantity end ) -(isnull(c.LOTQTY,0)+isnull(f.GDQTY,0))) as DECIMAL(18,4)) as  thisCreateQty,
 cast( a.Amount as DECIMAL(18,4)) as Amount,
 isnull(b.EffectiveEnable,0) as EffectiveEnable, 
 cast( isnull(b.EffectiveDays,0) as DECIMAL(18,4)) as EffectiveDays 
@@ -658,7 +658,7 @@ where isnull(a.EATTRIBUTE1,'')=''
             left join ICSInventoryLotDetail b on a.LotNo=b.LotNo and a.Type='3'
             where isnull(a.EATTRIBUTE1,'')=''
 			group by b.TransCode,b.TransSequence
-			) f on d.MOCode=f.TransCode and d.Sequence=f.TransSequence
+			) f on d.MOCode=f.TransCode and d.Sequence+'~'+a.Sequence=f.TransSequence
 			left join 
 (select  MinBL as BL ,MODetailID from (
 select a.MODetailID,