修改

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

@@ -303,6 +303,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private String pcFlag;
+    /**
+     * 合同价格/移库任务价格
+     */
+    @TableField(exist = false)
+    private Float contractPrice;
 
     @Override
     protected Serializable pkVal() {

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

@@ -100,6 +100,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 if (commonCompany!=null){
                     paymentManagement1.setCompName(commonCompany.getCompName());
                 }
+                WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                        .eq("relation_id", paymentManagement.getRelationId()));
+                if (weighingManagement!=null){
+                    paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
+                }
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(paymentManagement1.getWorkflowId())) {

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

@@ -299,6 +299,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
         qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());
         qualityInspectionManagement.setBinNumber(weighingManagement.getBinNumber());
+        qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
+        qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());
         qualityInspectionManagement.setManagementType("3");
         qualityInspectionManagement.setQualityDate(new Date());
         qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -71,6 +71,7 @@
         solid_grain_price as solidGrainPrice,
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
+        amount_not_payable as amountNotPayable,
         remarks,
         calculation_collectable as calculationCollectable,
         actual_collectionment as actualCollectionment,