zhangyuewww 2 years ago
parent
commit
f54f9f43fe

+ 4 - 4
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -227,14 +227,14 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         else if ("3".equals(qualityInspectionManagement.getFlag())){
             this.updateById(qualityInspectionManagement);
         }
-        if(qualityInspectionManagement.getCost() == null){
-            qualityInspectionManagement.setCost(Float.parseFloat((qualityInspectionManagement.getDryGrainPrice()==null?0:qualityInspectionManagement.getDryGrainPrice())*1000 + ""));
-        }
-        if("0".equals(qualityInspectionManagement.getBrazer()) && qualityInspectionManagement.getBrazer()!= null){
+        else if("0".equals(qualityInspectionManagement.getBrazer()) && qualityInspectionManagement.getBrazer()!= null){
             //质检员初检,状态改为已初检
             qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
             qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
         }
+        if(qualityInspectionManagement.getCost() == null){
+            qualityInspectionManagement.setCost(Float.parseFloat((qualityInspectionManagement.getDryGrainPrice()==null?0:qualityInspectionManagement.getDryGrainPrice())*1000 + ""));
+        }
         boolean one=this.updateById(qualityInspectionManagement);
         QualityInspectionManagement qualityInspectionManagement1=this.selectById(qualityInspectionManagement.getId());
         PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()