Forráskód Böngészése

成本报表 表头 出运日期

liuchaohui 2 éve
szülő
commit
e893e50744

+ 10 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.xml

@@ -13,11 +13,13 @@
         SELECT      
             max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
             max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department, 
-            max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata, 
+            max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
         FROM  UFDATA_901_2021.dbo.SO_SODetails s     
-        inner JOIN UFDATA_901_2021.dbo.SO_SOMain ss on ss.ID= s.ID     
+        inner JOIN UFDATA_901_2021.dbo.SO_SOMain ss on ss.ID= s.ID
+        JOIN UFDATA_901_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		JOIN UFDATA_901_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
         inner JOIN (     
                      SELECT      
                      om.cCode AS omCode,     
@@ -41,7 +43,7 @@
         SELECT      
             max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
             max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department, 
-            max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata, 
+            max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
         FROM  UFDATA_903_2021.dbo.SO_SODetails a     
@@ -66,6 +68,8 @@
         inner join UFDATA_902_2021.dbo.po_podetails g on g.POID=f.POID
         inner join UFDATA_902_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
         inner join UFDATA_902_2021.dbo.so_somain ss on ss.id=s.id
+        inner JOIN UFDATA_902_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		inner JOIN UFDATA_902_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
         inner join UFDATA_902_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
         inner JOIN UFDATA_902_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName 
@@ -76,7 +80,7 @@
         SELECT      
             max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
             max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department, 
-            max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata, 
+            max(cu.cCusAbbName) as customerShortame,v.cVenName as processUnit,min(rd.dDate) as outdata,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
             sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
         FROM  UFDATA_903_2021.dbo.SO_SODetails a     
@@ -101,6 +105,8 @@
         inner join UFDATA_901_2021.dbo.po_podetails g on g.POID=f.POID
         inner join UFDATA_901_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
         inner join UFDATA_901_2021.dbo.so_somain ss on ss.id=s.id
+        inner JOIN UFDATA_901_2021.dbo.rdrecords32 rds on rds.isodid =s.isosid
+		inner JOIN UFDATA_901_2021.dbo.rdrecord32 rd on rd.ID=rds.ID
         inner join UFDATA_901_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode 
         inner JOIN UFDATA_901_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode 
         WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenName