From a856ba46d206d6d8d317b9e79bc1c421d49bf02d Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 19 六月 2021 13:09:57 +0800
Subject: [PATCH] 1.pda原材料入库erp传入修改
---
src/main/java/com/zy/asrs/controller/ERPrelevantController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
index a94884f..5dad7f7 100644
--- a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
+++ b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
@@ -1,7 +1,10 @@
package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.service.MatCodeService;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.CPICMO;
import com.zy.common.web.BaseController;
@@ -16,11 +19,22 @@
public class ERPrelevantController extends BaseController {
@Autowired
private ErpService erpService;
+ @Autowired
+ private MatCodeService matCodeService;
@RequestMapping(value = "/erp/cpicmo/query")
@ManagerAuth
public R add(String fbillNo, String fsourceBillNo) {
List<CPICMO> erpCPICMOlist = erpService.queryErpCPICMO(fbillNo, fsourceBillNo);
+ if (erpCPICMOlist.size() > 0) {
+ for (CPICMO erpList : erpCPICMOlist) {
+ MatCode matCodeObj = matCodeService.selectById(erpList.getFnumber());
+ if (!Cools.isEmpty(matCodeObj)) {
+ erpList.setFname(matCodeObj.getMatName());
+ erpList.setFmodel(matCodeObj.getStr3());
+ }
+ }
+ }
return R.ok().add(erpCPICMOlist);
}
}
--
Gitblit v1.9.1