Explorar o código

成本报表 发运 款号

liuchaohui %!s(int64=2) %!d(string=hai) anos
pai
achega
cdc83a7943

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.xml

@@ -23,7 +23,7 @@
 			sum(shs.iQuantity) as shipQuantity,
 			sh.iExchRate AS exchangeRate,
 			sh.cSOCode AS orderNum,
-			c.cInvName AS poStyleNum,
+			max(so.cdefine22) AS poStyleNum,
 			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
@@ -38,7 +38,7 @@
 			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 			JOIN (
 			 SELECT
-				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity
+				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity,s.cdefine22
 			 FROM UFDATA_901_2021.dbo.SO_SODetails s
 			 JOIN (
 					SELECT
@@ -62,7 +62,7 @@
 			sum(shs.iQuantity) as shipQuantity,
 			sh.iExchRate AS exchangeRate,
 			sh.cSOCode AS orderNum,
-			c.cInvName AS poStyleNum,
+			max(so.cdefine22) AS poStyleNum,
 			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
@@ -76,7 +76,7 @@
 			LEFT JOIN UFDATA_902_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
 			LEFT JOIN UFDATA_902_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		JOIN (
-			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22
 						FROM  UFDATA_903_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
@@ -110,7 +110,7 @@
 		sum(shs.iQuantity) as shipQuantity,
 		sh.iExchRate AS exchangeRate,
 		sh.cSOCode AS orderNum,
-		c.cInvName AS poStyleNum,
+		max(so.cdefine22) AS poStyleNum,
 		max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 		sum(shs.iSum) as exportPrice,
 		sum(iNatSum) as rmbAmount,
@@ -124,7 +124,7 @@
 			LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
 			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		  JOIN (
-			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22
 						FROM  UFDATA_903_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (