1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -466,6 +466,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private Float netWeight;
+    /**
+     * 纯重（公斤）
+     */
+    @TableField(exist = false)
+    private Float pureWeight;
     /**
      * 仓位编号id
      */

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

@@ -713,7 +713,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             paymentManagement.setStatus("全部付款");
             paymentManagement.setStatusFlag("5");
             paymentManagement.setNetWeight(qualityInspectionManagement1.getNetWeight());
-            paymentManagement.setPureWeight(qualityInspectionManagement1.getNetWeight());
+            paymentManagement.setPureWeight(qualityInspectionManagement1.getPureWeight()!=null?qualityInspectionManagement1.getPureWeight():qualityInspectionManagement1.getNetWeight());
             paymentManagement.setManagementType("1");
             paymentManagement.setGrossWeight(qualityInspectionManagement1.getGrossWeight());
             paymentManagement.setTare(weighingManagement.getTare());
@@ -723,7 +723,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 paymentManagement.setBinNumber(qualityInspectionManagement1.getBinNumber());
             }
             paymentManagement.setUnitDeduction(qualityInspectionManagement1.getDeductionAmount()==null?0:qualityInspectionManagement1.getDeductionAmount());
-            Double money = (qualityInspectionManagement1.getDryGrainPrice()-paymentManagement.getUnitDeduction()) * qualityInspectionManagement1.getNetWeight();
+            Double money = (qualityInspectionManagement1.getDryGrainPrice()-paymentManagement.getUnitDeduction()) * (qualityInspectionManagement1.getPureWeight()!=null?qualityInspectionManagement1.getPureWeight():qualityInspectionManagement1.getNetWeight());
 //            BigDecimal money1 = new BigDecimal(money);
 //            Double money2 = money1.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
             if(qualityInspectionManagement1.getMoney() != null){