From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/controller/WorkController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 70f9050..29c274e 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -2,18 +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;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -28,31 +35,44 @@
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(memo = "鑾峰彇鍑哄簱绔欑偣")
+ @ManagerAuth()
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(101));
+ List<Map<String, Object>> result = new ArrayList<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", "C1");
+ map.put("desc", "C1" + "锛堝嚭搴撳彛1锛�");
+ result.add(map);
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("siteId", "C2");
+ map1.put("desc", "C2" + "锛堝嚭搴撳彛2锛�");
+ result.add(map1);
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("siteId", "C3");
+ map2.put("desc", "C3" + "锛堝嚭搴撳彛3锛�");
+ result.add(map2);
+ return R.ok().add(result);
}
@RequestMapping("/available/take/check/site")
- @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+ @ManagerAuth()
public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(103));
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
- @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
+ @ManagerAuth()
public R availableEmptyTakeSite(){
return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -66,7 +86,7 @@
@RequestMapping("/plate/out/start")
@ManagerAuth(memo = "鍑哄簱浣滀笟")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
- workService.startupFullTakeStore(param, getUserId());
+ workService.startupFullTakeStore(param, getUser());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -86,7 +106,7 @@
@RequestMapping("/locCheck/out/start")
@ManagerAuth(memo = "鐩樼偣鍑哄簱")
public R locCheckOutStart(@RequestBody StockOutParam param) {
- workService.locCheckOut(param, getUserId());
+ workService.locCheckOut(param, getUser());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -117,9 +137,23 @@
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
- return R.ok();
+ 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