修改

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

@@ -330,6 +330,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private String reportStatus;
+    /**
+     * 收款列表状态
+     */
+    @TableField(exist = false)
+    private String listStatus;
 
 
     @Override

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

@@ -262,7 +262,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 .eq("delete_flag", "0")
                 .orderBy("update_date", false));
         for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
-            Float money = 0.0f;
+//            Float money = 0.0f;
             Float collectMoney = 0.0f;
             //查收款管理列表
             List<PaymentManagement> paymentManagementList = this.selectList(new EntityWrapper<PaymentManagement>()
@@ -270,14 +270,14 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(paymentManagementList)) {
                 for (PaymentManagement paymentManagement : paymentManagementList) {
-                    money = money + paymentManagement.getAmountNotPayable();
+//                    money = money + paymentManagement.getAmountNotPayable();money > 0 ||
                     collectMoney = collectMoney + paymentManagement.getAmountNotCollectable();
                 }
                 //有未付/未收金额
-                if (money > 0 || collectMoney > 0) {
-                    contractManagementInfo.setReportStatus("待付款");
+                if ( collectMoney > 0) {
+                    contractManagementInfo.setListStatus("待付款");
                 } else {
-                    contractManagementInfo.setReportStatus("已付款");
+                    contractManagementInfo.setListStatus("已付款");
                 }
             }
         }

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

@@ -128,6 +128,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setCompId(weighingManagement1.getCompId());
                 paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
                 paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
+                paymentManagement1.setContractNo(weighingManagement1.getContractNo());
                 paymentManagement1.setGrossWeight(weighingManagement.getGrossWeight());
                 paymentManagement1.setTare(weighingManagement1.getTare());
                 paymentManagement1.setNetWeight(weighingManagement.getNetWeight());

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

@@ -60,6 +60,7 @@
         payment_no as paymentNo,
         goods_name as goodsName,
         car_no as carNo,
+        relation_id as relationId,
         type,
         contract_no as contractNo,
         net_weight as netWeight,
@@ -70,6 +71,7 @@
         solid_grain_price as solidGrainPrice,
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
+        remarks,
         calculation_collectable as calculationCollectable,
         actual_collectionment as actualCollectionment,
         amount_ed_collectionable as amountEdCollectionable,
@@ -80,7 +82,6 @@
         status,
         approve_status as approveStatus,
         status_flag as statusFlag,
-        car_no as carNo,
         workflow_id as workflowId
         FROM payment_management
         WHERE delete_flag = '0'

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

@@ -33,6 +33,11 @@
         q.quality_inspector as qualityInspector,
         q.car_number as carNumber,
         q.goods_name as goodsName,
+        q.grade,
+        q.imperfect_grain as imperfectGrain,
+        q.jiaorenli,
+        q.impurity,
+        q.mildew_grain as mildewGrain,
         q.tidal_grain_price as tidalGrainPrice,
         q.water_content as waterContent,
         q.bin_number as binNumber,