From e66095ce55dcc9450b953f77dd753c698c53fd55 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 27 十月 2025 08:12:27 +0800
Subject: [PATCH] 更新erp对接 1.销售订单按子单自动上报 2.其他订单按主单上报 3.客户可以选择物料进行出库
---
src/main/java/com/zy/asrs/controller/WorkController.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8d1520a..5d86b36 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -2,17 +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;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -27,25 +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());
+ 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()
+ 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());
}
@@ -57,9 +84,9 @@
}
@RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
- public R fullStoreTakeStart(StockOutParam param) {
- workService.startupFullTakeStore(param, getUserId());
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
+ public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStore(param, getUser());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -76,6 +103,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUser());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/loc/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@@ -84,16 +118,42 @@
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