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 | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index bc186d4..5d86b36 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -50,20 +50,18 @@
@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);
- }
+ 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);
}
@@ -88,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("鍑哄簱鍚姩鎴愬姛");
}
@@ -108,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("鍑哄簱鍚姩鎴愬姛");
}
@@ -154,8 +152,8 @@
@RequestMapping("/deal/preHave/start")
@ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
public R dealPreHave(@RequestParam Integer wrkNo) {
- StartupDto startupDto = workService.dealPreHaveStart(wrkNo, getUserId());
- return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + startupDto.getLocNo());
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
}
}
--
Gitblit v1.9.1