成本报表 面料余下

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

@@ -18,8 +18,8 @@
 
 	<select id="queryByCostFabric" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationFabric">
 		select tab.*,isnull(tab1.purchaseQuantity,0) as purchaseQuantity,tab2.jian-isnull(tab1.purchaseQuantity,0) as fabrictransferQuantity,
-				isnull(tab1.purchaseQuantity,0)-tab.usageQuantity as fabricremainingQuantity,
-				(tab1.purchaseQuantity-tab.usageQuantity)/tab1.purchaseQuantity as loss
+				tab2.jian-tab.usageQuantity as fabricremainingQuantity,
+				isnull((tab2.jian-tab.usageQuantity)/tab1.purchaseQuantity,0) as loss
 		from 
 		(
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as usageQuantity,
@@ -65,8 +65,8 @@
 		union all
 
 		select tab.*,isnull(tab1.purchaseQuantity,0) as purchaseQuantity,tab2.jian-isnull(tab1.purchaseQuantity,0) as fabrictransferQuantity,
-				isnull(tab1.purchaseQuantity,0)-tab.usageQuantity as fabricremainingQuantity,
-				(tab1.purchaseQuantity-tab.usageQuantity)/tab1.purchaseQuantity as loss
+				tab2.jian-tab.usageQuantity as fabricremainingQuantity,
+				isnull((tab2.jian-tab.usageQuantity)/tab1.purchaseQuantity,0) as loss
 		from
 		(
 				select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as usageQuantity,