From 84d7dbea21cbe9276bd1eccdb3e60daef095242e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 六月 2021 11:33:57 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms
---
src/main/java/com/zy/asrs/controller/ERPrelevantController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 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
new file mode 100644
index 0000000..5dad7f7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
@@ -0,0 +1,40 @@
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+@RestController
+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