From 21357f1d42f995e11e99a12a5f225fe6442b9ad1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 13:05:09 +0800
Subject: [PATCH] 优化定时任务及日志输出，调整订单同步逻辑
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
index 8fe7e30..3d54034 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -29,13 +29,13 @@
List<AgvBasDevp> agvBasDevpList = JSONArray.parseArray(param, AgvBasDevp.class);
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
//return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
return R.ok("鐢熸垚鍏ュ簱宸ヤ綔妗ｆ垚鍔�");
}
@RequestMapping("/locDdetl/adjust/start")
- @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ @ManagerAuth(memo = "")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
@@ -49,9 +49,19 @@
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
- workService.cancelWrkMast(workNo, getUserId());
+ workService.cancelWrkMast(workNo, getUserId(),2);
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 5) {
+ workService.cancelWrkMast(workNo, getUserId(),5);
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
}
return R.ok();
}
+
+ @RequestMapping("/hand/control/wrkMast/changeType")
+ @ManagerAuth(memo = "鍒囨崲璋冩嫧鏂瑰紡")
+ public R handControlWrkMastChangeType(@RequestParam String workNo){
+ workService.changeType(workNo, getUserId());
+ return R.ok();
+ }
}
--
Gitblit v1.9.1