成本报表 发运明细添加小po

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocationShipdetail.java

@@ -75,6 +75,10 @@ public class SyCostAllocationShipdetail implements Serializable {
     @Excel(name = "订单号", width = 15)
     @ApiModelProperty(value = "订单号")
     private String orderNum;
+
+    @Excel(name = "小PO", width = 15)
+    @ApiModelProperty(value = "小PO")
+    private String smallPo;
     /**产品款号*/
     @Excel(name = "产品款号", width = 15)
     @ApiModelProperty(value = "产品款号")

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

@@ -24,6 +24,7 @@
 			sh.iExchRate AS exchangeRate,
 			sh.cSOCode AS orderNum,
 			max(so.cdefine22) AS poStyleNum,
+			max(so.cDefine28) AS smallPo,
 			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
@@ -38,7 +39,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,s.cdefine22
+				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity,s.cdefine22,s.cDefine28
 			 FROM UFDATA_901_2021.dbo.SO_SODetails s
 			 JOIN (
 					SELECT
@@ -63,6 +64,7 @@
 			sh.iExchRate AS exchangeRate,
 			sh.cSOCode AS orderNum,
 			max(so.cdefine22) AS poStyleNum,
+			max(so.cDefine28) AS smallPo,
 			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
@@ -76,7 +78,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,s.cdefine22
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22,s.cDefine28
 						FROM  UFDATA_903_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
@@ -111,6 +113,7 @@
 		sh.iExchRate AS exchangeRate,
 		sh.cSOCode AS orderNum,
 		max(so.cdefine22) AS poStyleNum,
+		max(so.cDefine28) AS smallPo,
 		max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 		sum(shs.iSum) as exportPrice,
 		sum(iNatSum) as rmbAmount,
@@ -124,7 +127,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,s.cdefine22
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax,s.cdefine22,s.cDefine28
 						FROM  UFDATA_903_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (