原条码退货更新日志表

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs

@@ -822,26 +822,26 @@ namespace ICSSoft.DataProject
                     || TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeApply.GetDescription()
                     || TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription())
                 {
-                    ERPupdate = @"UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
+                    ERPupdate = @"--根据退料单退料
+                                UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSInventoryLotDetail b ON a.LotNo=b.LotNo AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSOApplyNegDetail c ON b.TransCode=c.OApplyNegCode AND b.TransSequence=c.Sequence AND b.WorkPoint=c.WorkPoint
-                                LEFT JOIN ICSOIssue m ON c.SourceDetailID=m.IssueDetailID  AND c.WorkPoint=m.WorkPoint
-                                WHERE ISNULL(m.ApplyDetailID, ISNULL(m.PickID, c.SourceDetailID))='{0}' AND a.Identification='{1}' AND  ERPUpload='0'
-
+                                WHERE c.SourceDetailID='{0}' AND a.Identification='{1}' AND  ERPUpload='0'
+                                --根据原条码退料-备料表
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSOutsourcingOrder y ON b.TransCode=y.OOCode AND b.WorkPoint=y.WorkPoint
                                 INNER JOIN ICSOOPick x ON x.OODetailID=y.OODetailID AND x.WorkPoint=y.WorkPoint AND b.TransSequence = y.Sequence + '~' + x.Sequence
                                 WHERE x.PickID='{0}' AND a.Identification='{1}' AND  a.ERPUpload='0'
-
+                                --根据原条码退料-申请单
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSOApply z ON b.TransCode=z.ApplyCode  AND b.TransSequence=z.Sequence AND b.WorkPoint=z.WorkPoint
                                 WHERE z.ApplyDetailID='{0}' AND a.Identification='{1}' AND  a.ERPUpload='0'
-
+                                --根据原条码退料-材料出库单
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint
@@ -886,26 +886,26 @@ namespace ICSSoft.DataProject
                         || TransType == TransTypeEnum.MOIssueDocNegativeApply.GetDescription()
                         || TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription())
                 {
-                    ERPupdate = @"UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
+                    ERPupdate = @"--根据退料单退料
+                                UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSInventoryLotDetail b ON a.LotNo=b.LotNo AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSMOApplyNegDetail c ON b.TransCode=c.ApplyNegCode AND b.TransSequence=c.Sequence AND b.WorkPoint=c.WorkPoint
-                                LEFT JOIN ICSMOIssue m ON c.SourceDetailID=m.IssueDetailID  AND c.WorkPoint=m.WorkPoint
-                                WHERE ISNULL(m.ApplyDetailID, ISNULL(m.PickID, c.SourceDetailID))='{0}' AND a.Identification='{1}' AND  ERPUpload='0'
-
+                                WHERE c.SourceDetailID='{0}' AND a.Identification='{1}' AND  ERPUpload='0'
+                                --根据原条码退料-备料表
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSMO y ON b.TransCode=y.MOCode AND b.WorkPoint=y.WorkPoint
                                 INNER JOIN ICSMOPick x ON x.MODetailID=y.MODetailID AND x.WorkPoint=y.WorkPoint AND b.TransSequence = y.Sequence + '~' + x.Sequence
                                 WHERE x.PickID='{0}' AND a.Identification='{1}' AND  a.ERPUpload='0'
-
+                                --根据原条码退料-申请单
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSMOApply z ON b.TransCode=z.ApplyCode  AND b.TransSequence=z.Sequence AND b.WorkPoint=z.WorkPoint
                                 WHERE z.ApplyDetailID='{0}' AND a.Identification='{1}' AND  a.ERPUpload='0'
-
+                                --根据原条码退料-材料出库单
                                 UPDATE a set ERPID='{2}',ERPDetailID='{3}',ERPCode='{4}',ERPSequence='{5}',ERPUpload='1'
                                 FROM ICSWareHouseLotInfoLog a
                                 INNER JOIN ICSWareHouseLotInfoLog b ON a.LogID=b.ID AND a.WorkPoint=b.WorkPoint