From 53ae8e478f6034579303c51bdf881ffa526c942c Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期六, 24 五月 2025 14:22:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 3c2815c..7753f55 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -318,7 +318,7 @@
// log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
//// throw new CoolException(e);
// }
- taskWrk.setWrkSts(9);
+
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
@@ -361,21 +361,18 @@
return R.error("娌℃湁鎵惧埌璇ヤ换鍔�={"+notifyDto+"}");
}
Date now = new Date();
- if(notifyDto.getMsgType().equals("task_complete")&&taskWrk.getIoType()==3){
- taskWrk.setWrkSts(9);//鏇存柊鏁版嵁瀹屾垚锛岀洿鎺ヨ浆鍘嗗彶妗�
-
- //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣�
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");
- locMastService.updateById(locMast);
-
- //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
- LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast2.setLocSts("F");
- locMastService.updateById(locMast2);
- taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
- taskWrkService.updateById(taskWrk);
+ if (notifyDto.getMsgType().equals("task_complete")) {
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3) {
+ taskWrk.setWrkSts(8);//鏇存柊鏁版嵁
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ } else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(18);//鏇存柊鏁版嵁
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ }
}
return R.ok();
}
--
Gitblit v1.9.1