zengtx 1 anno fa
parent
commit
f566c186e0

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationAccidentMapper.xml

@@ -26,7 +26,7 @@
 			it.business_people,it.garment_sales_order,material,it.quality_control,finance_remark
 		from incident_ticket it
 		join incident_ticket_children its on it.id=its.incident_ticket_id
-		where its.plan_number = #{code} and it.state = '5'
+		where its.plan_number = #{code}
 	</select>
 	<!--
 	SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -325,8 +325,8 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             Fabric.setPilosityFewer(Fabric.getUsageQuantity().subtract(Fabric.getPlanQuantity()));
 
 
-            //单耗件= 使用数量/表头计划数量
-            Fabric.setUnitConsumption(Fabric.getUsageQuantity().divide(syCostAllocation.getPlanQuantity(),4,BigDecimal.ROUND_HALF_UP));
+            //单耗件= 计划数量/表头计划数量
+            Fabric.setUnitConsumption(Fabric.getPlanQuantity().divide(syCostAllocation.getPlanQuantity(),4,BigDecimal.ROUND_HALF_UP));
 
         }