From 133e9fccff97927467a2edbfec8ae1f382722fae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 16:31:38 +0800
Subject: [PATCH] # 打印物料码 文本自动换行
---
src/main/java/com/zy/asrs/controller/WorkController.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 39ddbcb..d656b7a 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -2,16 +2,25 @@
import com.core.annotations.ManagerAuth;
import com.core.common.R;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -26,19 +35,46 @@
private BasDevpService basDevpService;
@RequestMapping("/available/put/site")
- @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
+ @ManagerAuth()
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/empty/put/site")
- @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
+ @ManagerAuth()
public R availableEmptyPutSite(){
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
+ @RequestMapping("/available/take/site")
+ @ManagerAuth()
+ public R availableTakeSite(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ 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);
+ for (Integer siteId : pickOutSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth()
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
+ }
+
@RequestMapping("/available/empty/take/site")
- @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
+ @ManagerAuth()
public R availableEmptyTakeSite(){
return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -46,30 +82,94 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- workService.startupFullStore(fullStoreParam,getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ }
+
+ @RequestMapping("/plate/out/start")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
+ public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/turn/over/out/start")
+ @ManagerAuth(memo = "瀹㈡埛杞崲")
+ public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOut(param, getUserId());
+ return R.ok("瀹㈡埛杞崲鎴愬姛");
+ }
+
+ @RequestMapping("/turn/over/out/payment/start")
+ @ManagerAuth(memo = "璐х墿褰㈡�佽浆鎹�")
+ public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOutPayment(param, getUserId());
+ return R.ok("璐х墿褰㈡�佸凡杞负"+param.getPayment$(param.getPayment()));
}
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
- workService.emptyPlateIn(sourceStaNo, getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
@RequestMapping("/empty/plate/out/start")
@ManagerAuth(memo = "绌烘澘鍑哄簱")
public R emptyPlateOutStart(EmptyPlateOutParam param) {
workService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鎴愬姛");
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/loc/move/start")
+ @ManagerAuth(memo = "搴撲綅绉昏浆")
+ public R locMoveStart(@RequestParam String sourceLocNo,
+ @RequestParam String targetLocNo) {
+ workService.locMove(sourceLocNo, targetLocNo, getUserId());
+ return R.ok("绉诲簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/locDdetl/adjust/start")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+ workService.adjustLocDetl(param, getUserId());
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
-
+ if (type == 1) {
+ workService.completeWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.pickWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ }
return R.ok();
}
+ @RequestMapping("/create/waitPain/wrkMast/start")
+ @ManagerAuth(memo = "鐢熸垚浠诲姟")
+ public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
+ StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+ return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ }
+
+ @RequestMapping("/deal/preHave/start")
+ @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+ public R dealPreHave(@RequestParam Integer wrkNo) {
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+ }
+
}
--
Gitblit v1.9.1