From e3d8c4b79889a8f26c3b312d606955b7f18066ef Mon Sep 17 00:00:00 2001 From: "DESKTOP-G2TH1JI\\vivian" Date: Mon, 30 May 2022 10:15:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ICSSoft.FromERP/ICSSoft.FromERP/ICSMOIssue.cs | 2 +- ICSSoft.FromERP/ICSSoft.FromERP/ICSOIssue.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSMOIssue.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSMOIssue.cs index d0b995e..12b0a76 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSMOIssue.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSMOIssue.cs @@ -84,7 +84,7 @@ namespace ICSSoft.FromERP LEFT JOIN {1}.dbo.Inventory inv ON b.cInvCode = inv.cInvCode left join {1}.dbo.mom_order c on a.iproorderid=c.MoId left JOIN {1}.dbo.mom_orderdetail d ON c.MoId=d.MoId - where ISNULL(a.cHandler , '')='' and (a.cSource='生产订单' or a.cSource='领料申请单') AND ISNULL(a.dnmodifytime, a.dnmaketime)>=@LastTime + where ISNULL(a.cHandler , '')='' and (a.cSource='生产订单' or a.cSource='领料申请单') and a.cBusType='领料' AND ISNULL(a.dnmodifytime, a.dnmaketime)>=@LastTime update #TempRd set Colspan=isNULL(ProjectCode,'')+'~'+isNULL(cBatch,'')+'~'+isNULL(Version,'')+'~'+isNULL(Brand,'')+'~'+isNULL(cFree1,'')+'~'+isnull(cFree2,'')+'~'+isnull(cFree3,'')+'~'+isnull(cFree4,'')+'~'+isnull(cFree5,'')+'~'+isnull(cFree6,'')+'~'+isnull(cFree7,'')+'~'+isnull(cFree8,'')+'~'+isnull(cFree9,'')+'~'+isnull(cFree10,'') select distinct Colspan,ProjectCode,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,WorkPoint,cBatch,version ,brand diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOIssue.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOIssue.cs index 791d9ee..3f55851 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSOIssue.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSOIssue.cs @@ -87,7 +87,7 @@ namespace ICSSoft.FromERP LEFT JOIN {1}.dbo.Inventory inv ON b.cInvCode = inv.cInvCode left join {1}.dbo.mom_order c on a.iproorderid=c.MoId left JOIN {1}.dbo.mom_orderdetail d ON c.MoId=d.MoId - where ISNULL(a.cHandler , '')='' and a.cSource='委外订单' AND ISNULL(a.dnmodifytime, a.dnmaketime)>=@LastTime + where ISNULL(a.cHandler , '')='' and (a.cSource='委外订单' or a.cSource='领料申请单') and a.cBusType='委外发料' AND ISNULL(a.dnmodifytime, a.dnmaketime)>=@LastTime update #TempRd set Colspan=isNULL(ProjectCode,'')+'~'+isNULL(cBatch,'')+'~'+isNULL(Version,'')+'~'+isNULL(Brand,'')+'~'+isNULL(cFree1,'')+'~'+isnull(cFree2,'')+'~'+isnull(cFree3,'')+'~'+isnull(cFree4,'')+'~'+isnull(cFree5,'')+'~'+isnull(cFree6,'')+'~'+isnull(cFree7,'')+'~'+isnull(cFree8,'')+'~'+isnull(cFree9,'')+'~'+isnull(cFree10,'') select distinct Colspan,ProjectCode,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,WorkPoint,cBatch,version ,brand