成本报表 发运 101账套加工单价加工费

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

@@ -27,9 +27,9 @@
 			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
-			max(so.iTax) as procesUnitPriceusd,
-			max(so.iNatTax) as procesUnitPricermb,
-			max(so.iNatTax) * sum(shs.iQuantity) as processCost,
+			max(so.procesUnitPriceusd) as procesUnitPriceusd,
+			max(so.procesUnitPricermb) as procesUnitPricermb,
+			max(so.procesUnitPriceusd) * sum(so.iPBVQuantity) as processCost,
 			v.cVenName AS processUnit
 		 FROM
 			UFDATA_901_2021.dbo.SaleBillVouch sh
@@ -38,13 +38,21 @@
 			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 			JOIN (
 			 SELECT
-				supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+				supplierCode,s.iSOsID,s.id ,o.procesUnitPriceusd,o.procesUnitPricermb,o.iPBVQuantity
 			 FROM UFDATA_901_2021.dbo.SO_SODetails s
 			 JOIN (
 					SELECT
 					 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax
+					 ,pb.procesUnitPriceusd,pb.procesUnitPricermb,pb.iPBVQuantity
 					FROM UFDATA_901_2021.dbo.OM_MOMain om
-					 LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					left join (
+						SELECT p.iorderdid,max(bi.inattaxprice) as procesUnitPricermb,max(bi.iOriTaxCost ) as procesUnitPriceusd
+									,sum(bi.iPBVQuantity) as iPBVQuantity
+						from UFDATA_901_2021.dbo.PO_Podetails p
+						join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=p.ID
+						GROUP BY p.iorderdid
+				 ) pb on pb.iorderdid=od.isosid
 					WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
 				) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 			) so ON so.iSOsID = rd.iorderdid