修改

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

@@ -308,6 +308,16 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private Float contractPrice;
+    /**
+     * 检斤单
+     */
+    @TableField(exist = false)
+    private String weighingPictureAddress;
+    /**
+     * 质检单
+     */
+    @TableField(exist = false)
+    private String qualityInspectionPictureAddress;
 
     @Override
     protected Serializable pkVal() {

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

@@ -112,6 +112,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                         .eq("relation_id", paymentManagement1.getRelationId()));
                 if (weighingManagement!=null){
                     paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
+                    paymentManagement1.setWeighingPictureAddress(weighingManagement.getPictureAddress());
+                }
+                QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                        .eq("relation_id", paymentManagement1.getRelationId()));
+                if (qualityInspectionManagement!=null){
+                    paymentManagement1.setQualityInspectionPictureAddress(qualityInspectionManagement.getPictureAddress());
                 }
                 String taskId = "";
                 // 只有待审核状态才有taskId

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

@@ -19,6 +19,12 @@
             <if test="searchType == 4">
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
+            <if test="searchType == 5">
+                AND amount_ing_payable-amount_ed_payable>0
+            </if>
+            <if test="searchType == 6">
+                AND amount_ed_payable=amount_ing_payable
+            </if>
         </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
@@ -108,6 +114,12 @@
             <if test="searchType == 4">
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
+            <if test="searchType == 5">
+                AND amount_ing_payable-amount_ed_payable>0
+            </if>
+            <if test="searchType == 6">
+                AND amount_ed_payable=amount_ing_payable
+            </if>
         </if>
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}

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

@@ -9,6 +9,7 @@
         WHERE
         q.comp_id = #{compId}
         AND q.warehouse_name = #{warehouseName}
+        AND TO_DAYS(q.create_date) = TO_DAYS(NOW())
     </select>
     <!-- 仓库数量包括已删除的 -->
     <select id="getWareHouseCountByCondition" parameterType="Map" resultType="java.lang.Integer">