成本报表 面辅料 购入

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

@@ -17,8 +17,8 @@
 	</select>
 
 	<select id="queryByCostFabric" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationFabric">
-		select tab.*,tab1.purchaseQuantity,tab2.jian-tab1.purchaseQuantity as fabrictransferQuantity,
-				tab1.purchaseQuantity-tab.usageQuantity as fabricremainingQuantity,
+		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
 		from 
 		(
@@ -64,8 +64,8 @@
 
 		union all
 
-		select tab.*,tab1.purchaseQuantity,tab2.jian-tab1.purchaseQuantity as fabrictransferQuantity,
-				tab1.purchaseQuantity-tab.usageQuantity as fabricremainingQuantity,
+		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
 		from
 		(

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

@@ -17,8 +17,8 @@
 	</select>
 
 	<select id="queryByCostIngredient" resultType="org.jeecg.modules.cost.entity.SyCostAllocationIngredient">
-		select tab.*,tab1.purchaseQuantity,tab2.jian-tab1.purchaseQuantity as ingredientsTransferQuantity,
-				tab1.purchaseQuantity-tab.usageQuantity as ingredientsRemainingQuantity,
+		select tab.*,isnull(tab1.purchaseQuantity,0) as purchaseQuantity,tab2.jian-isnull(tab1.purchaseQuantity,0) as ingredientsTransferQuantity,
+				isnull(tab1.purchaseQuantity,0)-tab.usageQuantity as ingredientsRemainingQuantity,
 				(tab1.purchaseQuantity-tab.usageQuantity)/tab1.purchaseQuantity as loss
 		from 
 		(
@@ -74,8 +74,8 @@
 
 		union all
 
-		select tab.*,tab1.purchaseQuantity,tab2.jian-tab1.purchaseQuantity as ingredientsTransferQuantity,
-				tab1.purchaseQuantity-tab.usageQuantity as ingredientsRemainingQuantity,
+		select tab.*,isnull(tab1.purchaseQuantity,0) as purchaseQuantity,tab2.jian-isnull(tab1.purchaseQuantity,0) as ingredientsTransferQuantity,
+				isnull(tab1.purchaseQuantity,0)-tab.usageQuantity as ingredientsRemainingQuantity,
 				(tab1.purchaseQuantity-tab.usageQuantity)/tab1.purchaseQuantity as loss
 		from
 		(