1

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

@@ -514,6 +514,8 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private Double depositReceived;
+    @TableField(exist = false)
+    private List<CollectionWarehousingRecord> collectionWarehousingRecordList;
 
 
     @Override

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

@@ -77,6 +77,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     private INoticeService noticeService;
     @Autowired
     private IPriceConfirmationSheetService priceConfirmationSheetService;
+    @Autowired
+    private ICollectionWarehousingRecordService collectionWarehousingRecordService;
     @Value("${file-root-path}")
     private String localPath;
 
@@ -455,6 +457,15 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             }
             contractManagementInfo.setCompletedQuantity(inWeight);
         }
+        //代收合同
+        else if ("3".equals(contractManagementInfo.getContractType())) {
+            List<CollectionWarehousingRecord> collectionWarehousingRecordList=collectionWarehousingRecordService.selectList(new EntityWrapper<CollectionWarehousingRecord>()
+                    .eq("contract_no",contractManagementInfo.getContractNo())
+                    .eq("comp_id",contractManagementInfo.getCompId()));
+            if (CollectionUtils.isNotEmpty(collectionWarehousingRecordList)){
+                contractManagementInfo.setCollectionWarehousingRecordList(collectionWarehousingRecordList);
+            }
+        }
         //销售合同
         else {
             //定义出库量