成本报表 发运101

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

@@ -29,7 +29,7 @@
 			sum(iNatSum) as rmbAmount,
 			max(so.procesUnitPriceusd) as procesUnitPriceusd,
 			max(so.procesUnitPricermb) as procesUnitPricermb,
-			max(so.procesUnitPriceusd) * sum(so.iPBVQuantity) as processCost,
+			max(so.procesUnitPricermb) * sum(shs.iQuantity) as processCost,
 			v.cVenName AS processUnit
 		 FROM
 			UFDATA_901_2021.dbo.SaleBillVouch sh
@@ -42,18 +42,13 @@
 			 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
+			 max(om.cVenCode) AS supplierCode,od.cInvCode,od.isosid,sum(od.iTax) as iTax,sum(od.iNatTax) as iNatTax
+			 ,min(od.iNatMoney) as procesUnitPricermb,max(bi.iOriTaxCost ) as procesUnitPriceusd,count(1) as 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 (
-						SELECT p.iorderdid,max(bi.inattaxprice) as procesUnitPricermb,max(bi.iOriTaxCost ) as procesUnitPriceusd
-									,count(1) 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
+					left join UFDATA_901_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
 					WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
+					GROUP BY od.cInvCode,od.isosid
 				) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
 			) so ON so.iSOsID = rd.iorderdid
 		 LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode