修改

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

@@ -43,9 +43,6 @@ public class StockPurchaseReceiptReportController {
     public  String disAndRemark(@RequestBody ContractManagementInfo contractManagementInfo){
         return stockPurchaseReceiptReportService.disAndRemark(contractManagementInfo);
     }
-
-
-
     /**
      * 修改结算重量
      *

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

@@ -44,7 +44,6 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      * @param stockPurchaseReceiptReport
      */
     String payMoney(StockPurchaseReceiptReport stockPurchaseReceiptReport);
-
     /**
      * 合同编号下拉列表
      *

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

@@ -10,9 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.StockPurchaseReceiptReport;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StockPurchaseReceiptReportMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
 import com.yh.saas.plugin.yiliangyiyun.service.IStockPurchaseReceiptReportService;
@@ -48,7 +48,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     private ICommonRoleResourceService roleResourceService;
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
-
+    @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
 
     /**
      * 采购入库统计
@@ -208,7 +209,11 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 .eq("contract_type", "2")
                 .eq("delete_flag", "0")
                 .orderBy("update_date", false));
+
         for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+            ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                    .eq("contract_id",contractManagementInfo.getId()));
+            contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
             Float money = 0.0f;
             //查现货采购入库报表
             List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()