1

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

@@ -246,6 +246,11 @@ public class CollectionWarehousingRecord extends BaseModel<CollectionWarehousing
      */
     @TableField(exist = false)
     private Double num;
+    /**
+     * 代收费
+     */
+    @TableField(exist = false)
+    private Double agencyCharge;
 
     @Override
     protected Serializable pkVal() {

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

@@ -71,7 +71,7 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
 
 
     /**
-     * 销售出库统计列表
+     * 代收记录列表
      *
      * @param collectionWarehousingRecord
      */
@@ -148,7 +148,7 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
 
     }
     /**
-     * 添加代售合同入库记录
+     * 添加代收合同入库记录
      *
      * @param collectionWarehousingRecord
      * @return
@@ -235,10 +235,10 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteCollectionWarehousingRecord(String id) {
-        //查询销售计划信息
+        //查询代收记录信息
         CollectionWarehousingRecord collectionWarehousingRecord = this.selectById(id);
         if (collectionWarehousingRecord != null) {
-            //删除销售计划信息
+            //删除代收记录信息
             this.deleteById(collectionWarehousingRecord.getId());
         }
     }
@@ -288,15 +288,20 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
     }
 
     /**
-     * 查看销售计划
+     * 查看代收记录信息
      *
      * @param id
      * @return
      */
     @Override
     public CollectionWarehousingRecord getCollectionWarehousingRecord(String id) {
-        //查看销售计划信息
+        //查看代收记录信息
         CollectionWarehousingRecord collectionWarehousingRecord = this.selectById(id);
+        ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+            .eq("contract_no",collectionWarehousingRecord.getContractNo())
+            .eq("comp_id",collectionWarehousingRecord.getCompId()));
+        //合同代收费
+        collectionWarehousingRecord.setAgencyCharge(contractManagementInfo.getAgencyCharge());
         return collectionWarehousingRecord;
     }