1

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

@@ -349,6 +349,10 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 反馈负责人电话
      */
     private String feedbackLeaderPhone;
+    /**
+     * 客户送粮上限
+     */
+    private Float grainDelivery;
     /**
      * 模糊查询
      */
@@ -441,6 +445,26 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private Double invoiced;
+    /**
+     * 应付金额
+     */
+    @TableField(exist = false)
+    private Double amountIngPayable;
+    /**
+     * 已收金额
+     */
+    @TableField(exist = false)
+    private Double amountEdCollectionable;
+    /**
+     * 应收金额
+     */
+    @TableField(exist = false)
+    private Double amountNotCollectable;
+    /**
+     * 已付金额
+     */
+    @TableField(exist = false)
+    private Double amountEdPayableNew;
 
 
     @Override

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

@@ -70,7 +70,6 @@
         id,
         comp_id as compId,
         payment_no as paymentNo,
-        warehouse_name as warehouseName,
         goods_name as goodsName,
         car_no as carNo,
         relation_id as relationId,
@@ -78,14 +77,11 @@
         contract_no as contractNo,
         net_weight as netWeight,
         invoicing_sale as invoicingSale,
-        tare,
         unit_deduction as unitDeduction,
         unit_have as unithave,
-        solid_grain_price as solidGrainPrice,
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
         amount_not_payable as amountNotPayable,
-        remarks,
         payment_screenshot as paymentScreenshot,
         collection_screenshot as collectionScreenshot,
         amount_ed_collectionable as amountEdCollectionable,
@@ -103,7 +99,7 @@
         unit_deduction as unitDeduction,
         picture_address as pictureAddress,
         invoicing,
-        grade,
+        grade
         FROM collection_warehousing_record
         WHERE
         delete_flag = '0'

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

@@ -75,6 +75,26 @@
         p.mildew_grain as contractExpenditure,
         p.water_content as expenses,
         p.goods_name as invoiced,
+        (SELECT IFNULL(sum(col.amount_ing_payable),0)
+        FROM collection_warehousing_record col
+        WHERE col.delete_flag = '0'
+        AND col.contract_no=m.contract_no
+        AND col.comp_id = m.comp_id) as amountIngPayable,
+        (SELECT IFNULL(sum(col.amount_ed_payable),0)
+        FROM collection_warehousing_record col
+        WHERE col.delete_flag = '0'
+        AND col.contract_no=m.contract_no
+        AND col.comp_id = m.comp_id) as amountEdPayableNew,
+        (SELECT IFNULL(sum(col.amount_not_collectable),0)
+        FROM collection_warehousing_record col
+        WHERE col.delete_flag = '0'
+        AND col.contract_no=m.contract_no
+        AND col.comp_id = m.comp_id) as amountNotCollectable,
+        (SELECT IFNULL(sum(col.amount_ed_collectionable),0)
+        FROM collection_warehousing_record col
+        WHERE col.delete_flag = '0'
+        AND col.contract_no=m.contract_no
+        AND col.comp_id = m.comp_id) as amountEdCollectionable,
         case when m.deliver_type = '1' then (SELECT IFNULL(sum(t.amount_ed_payable),0)
         FROM tran_settlement_report t
         WHERE t.delete_flag = '0'