1

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

@@ -425,6 +425,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private Double actualWeighingFee;
+    /**
+     *合同对象
+     */
+    @TableField(exist = false)
+    private ContractManagementInfo contractManagement;
     /**
      * 银行信息
      */

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

@@ -570,13 +570,14 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 .eq("receive_warehouse",warehouseName)
                 .eq("task_status_key","5")
                 .eq("in_out_type_key","3")
+                .eq("in_out_flag","2")
                 .eq("delete_flag","0"));
         if(CollectionUtils.isNotEmpty(stringList)){
             List<ContractManagementInfo> contractManagementInfoList=new ArrayList<>();
             for(InOutWarehouseTask inOutWarehouseTask1 : stringList){
                 ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("contract_no",inOutWarehouseTask1.getMoveTaskNo())
-                        .eq("deliver_type","3")
+                        .eq("contract_no",inOutWarehouseTask1.getSendWarehouse())
+                        .eq("acquisition_in","1")
                         .eq("delete_flag", "0")
                 );
                 if (contractManagementInfo!=null){

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

@@ -211,7 +211,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 .eq("comp_id", paymentManagement.getCompId()));
         CommonCompany commonCompany = commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
                 .eq("comp_id", paymentManagement.getCompId()));
-
+        ContractManagementInfo contractManagementInfo=ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("comp_id",paymentManagement.getCompId())
+                .eq("contract_no",paymentManagement.getContractNo()));
+        if (contractManagementInfo!=null){
+            paymentManagement.setContractManagement(contractManagementInfo);
+        }
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("comp_id",qualityInspectionManagement.getCompId())
                 .eq("warehouse_name",qualityInspectionManagement.getWarehouseName()));