From 2621b20f67dd0c76e1cbc450a0fd44e702f8d094 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 29 四月 2025 16:09:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 152 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 112 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 24add0e..234a20c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -68,6 +68,8 @@
private CommonService commonService;
@Autowired
private NotifyUtils notifyUtils;
+ @Autowired
+ private BasDevpService basDevpService;
private static final boolean auth = true;
@@ -95,18 +97,24 @@
@RequestBody TaskCreateParam param,
HttpServletRequest request) {
auth(appkey, param, request);
+
+ R result = null;
try{
if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ result = R.parse(BaseRes.PARAM);
+ return result;
}
if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ result = R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ return result;
}
if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ result = R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ return result;
}
if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ result = R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ return result;
}
String locNo=null;
if (param.getIoType() == 1) {
@@ -119,24 +127,37 @@
.eq("loc_no", locNo).ne("loc_sts", "X"));
if (Cools.isEmpty(locMast)) {
log.error("搴撲綅鍙蜂笉瀛樺湪" + locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪" + locNo).add("搴撲綅鍙蜂笉瀛樺湪" + locNo);
+ result = R.error("搴撲綅鍙蜂笉瀛樺湪" + locNo).add("搴撲綅鍙蜂笉瀛樺湪" + locNo);
+ return result;
}
} catch (Exception e) {
log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
+ result = R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
+ return result;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
.eq("loc_no", locNo)
.eq("barcode", param.getBarcode()));
if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+ result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + locMast.getLocNo());
+ return result;
}
- return openService.taskCreate(param);
+ result = openService.taskCreate(param);
+ return result;
}catch (Exception e){
log.error("浠诲姟涓嬪彂寮傚父" + e);
return R.error();
+ }finally {
+ apiLogService.save("wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,""
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,JSON.toJSONString(result)
+ ,true
+ );
}
}
@@ -254,40 +275,65 @@
@RequestBody TaskCancelParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getIoType())) {
- return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
- }
+ R result = null;
+ try {
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("宸ヤ綔鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
+ }
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
- .eq("task_no", param.getTaskNo())
- .eq("io_type", param.getIoType())
- .eq("barcode", param.getBarcode()));
- if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡鍒板綋鍓嶄换鍔�---" + param);
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
+ .eq("task_no", param.getTaskNo())
+ .eq("io_type", param.getIoType())
+ .eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(taskWrk)){
+ result = R.error("鏈煡鍒板綋鍓嶄换鍔�---" + param);
+ return result;
+ }
+ boolean sign = false;
+ switch (param.getTaskStatus()) {
+ case 1://姝ｅ父鍙栨秷
+ if (taskWrk.getStatus() > 1) {
+ if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() <= 2) {//鍏ュ簱
+ break;
+ }
+
+ result = R.error("浠诲姟宸插紑濮嬫墽琛�");
+ return result;
+ }
+ break;
+ case 2://姝ｅ父瀹屾垚
+ if (taskWrk.getStatus() > 1) {
+ result = R.error("浠诲姟宸插紑濮嬫墽琛�");
+ return result;
+ }
+ sign = true;
+ break;
+ default:
+ result = R.error("鏈煡鎿嶄綔");
+ return result;
+ }
+ result = taskWrkOperate(taskWrk, sign);
+ return result;
+ } catch (Exception e) {
+ e.printStackTrace();
+ result = R.error(e.getMessage());
+ return R.error(e.getMessage());
+ }finally {
+ apiLogService.save("wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,""
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,JSON.toJSONString(result)
+ ,true
+ );
}
- boolean sign =false;
- switch (param.getTaskStatus()) {
- case 1://姝ｅ父鍙栨秷
- if (taskWrk.getStatus() > 1) {
- return R.error("浠诲姟宸插紑濮嬫墽琛�");
- }
- break;
- case 2://姝ｅ父瀹屾垚
- if (taskWrk.getStatus() > 1) {
- return R.error("浠诲姟宸插紑濮嬫墽琛�");
- }
- sign = true;
- break;
- default:
- return R.error("鏈煡鎿嶄綔");
- }
- return taskWrkOperate(taskWrk, sign);
}
//浠诲姟鎿嶄綔
@@ -325,6 +371,32 @@
return R.ok(crnStatusParams);
}
+ //杈撻�佺珯鐐圭姸鎬佹煡璇㈡帴鍙�
+ @GetMapping("/stationStatus")
+ @Transactional
+ public R stationStatus() {
+ List<StationStatusParam> data = new ArrayList<>();
+ List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
+ for (BasDevp basDevp : list) {
+ String taskNo = "";
+ if (basDevp.getWrkNo() > 0) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
+ if (taskWrk != null) {
+ taskNo = taskWrk.getTaskNo();
+ }
+ }
+
+ StationStatusParam param = new StationStatusParam();
+ param.setStaNo(basDevp.getDevNo());
+ param.setTaskNo(taskNo);
+ param.setLoading(basDevp.getLoading());
+
+ data.add(param);
+ }
+ return R.ok(data);
+ }
+
//妯℃嫙杈撻�佺嚎鍏ュ簱
@PostMapping("/simulationDevpIn")
@Transactional
--
Gitblit v1.9.1