From 0c6af95569b8cc1c9a3e86039a2658e99f671f17 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 十二月 2023 16:43:56 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
index c5427fb..dac07bd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wms.controller;
+import com.zy.asrs.common.domain.param.FullStoreParam;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.service.BasDevpService;
import com.zy.asrs.common.wms.service.WorkService;
@@ -7,7 +8,9 @@
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -32,27 +35,28 @@
@RequestMapping("/available/put/site")
@ManagerAuth()
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableInSite());
+ return R.ok().add(basDevpService.getAvailableInSite(getHostId()));
}
@RequestMapping("/available/empty/put/site")
@ManagerAuth()
public R availableEmptyPutSite(){
- return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ return R.ok().add(basDevpService.getAvailableEmptyInSite(getHostId()));
}
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
+ Long hostId = getHostId();
List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101, hostId);
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
result.add(map);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103, hostId);
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
@@ -65,7 +69,30 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(107));
+ return R.ok().add(basDevpService.getAvailableOutSite(107, getHostId()));
+ }
+
+ @RequestMapping("/full/store/put/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+ public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam, getUserId(), getHostId()));
+ }
+
+ @RequestMapping("/hand/control/wrkMast")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestParam String workNo,
+ @RequestParam Integer type){
+ if (type == 1) {
+ workService.completeWrkMast(workNo, getUserId(), getHostId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo, getUserId(), getHostId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.pickWrkMast(workNo, getUserId(), getHostId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ }
+ return R.ok();
}
}
--
Gitblit v1.9.1