调整接口

WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs

@@ -591,7 +591,7 @@ left join  ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
 LEFT JOIN ICSInventoryDetail detail on b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint 
 left join (
 select mm.TransCode,mm.TransSequence,sum(isnull(ee.Quantity,0)) LOTQTY,ee.WorkPoint from ICSInventoryLot ee 
-left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='4'
+left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='4' AND ee.EATTRIBUTE1 is NULL
  group by mm.TransCode,mm.TransSequence,ee.WorkPoint
 )c
 on a.SDNCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint
@@ -767,7 +767,7 @@ left join  ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
 LEFT JOIN ICSInventoryDetail detail on b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint 
 left join (
 select mm.TransCode,mm.TransSequence,sum(isnull(ee.Quantity,0)) LOTQTY,ee.WorkPoint from ICSInventoryLot ee 
-left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='5'
+left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='5' AND ee.EATTRIBUTE1 is NULL
  group by mm.TransCode,mm.TransSequence,ee.WorkPoint
 )c
 on a.InCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint 
@@ -1004,7 +1004,7 @@ left join ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
 LEFT JOIN ICSInventoryDetail detail on b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint 
 left join (
 select mm.TransCode,mm.TransSequence,sum(isnull(ee.Quantity,0)) LOTQTY,ee.WorkPoint from ICSInventoryLot ee
-left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='7'
+left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='7' and ee.EATTRIBUTE1 is null
 group by mm.TransCode,mm.TransSequence,ee.WorkPoint
 ) c on a.DNCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint 
 -- inner join ICSPurchaseOrder d on a.POID=d.POID and a.PODetailID=d.PODetailID and a.WorkPoint=d.WorkPoint
@@ -1173,7 +1173,7 @@ left join ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
 LEFT JOIN ICSInventoryDetail detail on b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint 
 left join (
 select mm.TransCode,mm.TransSequence,sum(isnull(ee.Quantity,0)) LOTQTY,ee.WorkPoint from ICSInventoryLot ee
-left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='9'
+left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='9' AND ee.EATTRIBUTE1 is NULL
 group by mm.TransCode,mm.TransSequence,ee.WorkPoint
 ) c on a.RCVCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint
 left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint 
@@ -2210,7 +2210,7 @@ where a.DNType='3'  and a.Status='2' and a.EATTRIBUTE1 is NOT null
                             LEFT JOIN ICSInventoryDetail detail ON b.InvCode=detail.INVCode  AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint
                             left join (
                             select mm.TransCode,mm.TransSequence,sum(isnull(ee.Quantity,0)) LOTQTY,ee.WorkPoint from ICSInventoryLot ee 
-                            left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='12'
+                            left join ICSInventoryLotDetail mm on ee.LotNo=mm.LotNo and ee.type='12' AND ee.EATTRIBUTE1 is NULL
                             group by mm.TransCode,mm.TransSequence,ee.WorkPoint
                             )c
                             on a.ApplyNegCode=c.TransCode and a.Sequence=c.TransSequence and a.WorkPoint=c.WorkPoint