修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractGoodsInfoController.java

@@ -27,8 +27,8 @@ public class ContractGoodsInfoController {
      * @return
      */
     @GetMapping("/getGoodsName")
-    public ContractGoodsInfo getGoodsName(String contractId) {
-        return contractGoodsInfoService.getGoodsName(contractId);
+    public ContractGoodsInfo getGoodsName(String contractId ,String contractNo) {
+        return contractGoodsInfoService.getGoodsName(contractId,contractNo);
     }
 }
 

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
@@ -81,7 +82,16 @@ public class ContractGoodsInfo extends BaseModel<ContractGoodsInfo> {
      */
     private String grade;
 
-
+    /**
+     * 重量（吨）
+     */
+    @TableField(exist = false)
+    private Float weight;
+    /**
+     * 合同单价（元/每吨）
+     */
+    @TableField(exist = false)
+    private Double unitContractPrice;
 
     @Override
     protected Serializable pkVal() {

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

@@ -19,5 +19,5 @@ public interface IContractGoodsInfoService extends IService<ContractGoodsInfo> {
      *
      * @param
      */
-    ContractGoodsInfo getGoodsName(String contractId);
+    ContractGoodsInfo getGoodsName(String contractId ,String contractNo);
 }

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

@@ -1,10 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractGoodsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,14 +21,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class ContractGoodsInfoServiceImpl extends ServiceImpl<ContractGoodsInfoMapper, ContractGoodsInfo> implements IContractGoodsInfoService {
 
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
     /**
-     * 查看
+     * 查看货物信息
      * @param contractId
      * @return
      */
     @Override
-    public ContractGoodsInfo getGoodsName(String contractId){
+    public ContractGoodsInfo getGoodsName(String contractId ,String contractNo){
+        //货物信息
         ContractGoodsInfo contractGoodsInfo = this.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractId));
+        //合同信息
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>().eq(ContractManagementInfo.QueryFiles.CONTRACT_NO, contractNo));
+        contractGoodsInfo.setWeight(contractManagementInfo.getWeight());
+        contractGoodsInfo.setUnitContractPrice(contractManagementInfo.getUnitContractPrice());
         return contractGoodsInfo;
     }
 }