From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/controller/MatStoreController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatStoreController.java b/src/main/java/com/zy/asrs/controller/MatStoreController.java
index a20063c..bbfe7ff 100644
--- a/src/main/java/com/zy/asrs/controller/MatStoreController.java
+++ b/src/main/java/com/zy/asrs/controller/MatStoreController.java
@@ -3,6 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.service.MatStoreService;
import com.zy.asrs.service.WorkService;
import com.zy.common.web.BaseController;
import com.zy.ints.service.WaitMatinService;
@@ -21,10 +22,13 @@
private WaitMatinService waitMatinService;
@Autowired
private WorkService workService;
+ @Autowired
+ private MatStoreService matStoreService;
@RequestMapping("/mat/store/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱(閫氱煡妗�)")
+ @ManagerAuth(memo = "鍏ュ簱鍚姩(閫氱煡妗�)")
public R matStoreStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+// return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(matStoreService.startupFullStore(fullStoreParam,getUserId()));
}
}
--
Gitblit v1.9.1