From a30c391e7d84ebfad7bda46d5fd86be54a0591d2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 三月 2024 10:37:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index dfeb919..50b7e6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -323,9 +323,18 @@
log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
continue;//鍛戒护涓嬪彂澶辫触
}
-
// 澶嶄綅鍫嗗灈鏈�
crnThread.setResetFlag(true);
+
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
+ taskWrk.setWrkSts(4);
+ } else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(14);
+ }
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+
}
}
@@ -793,6 +802,14 @@
if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
+ taskWrk.setWrkSts(4);
+ } else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(14);
+ }
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
}
}
}
@@ -992,10 +1009,13 @@
}
//鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
- CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
- if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
- continue;//鎸囦护鏈畬鎴�
+ if (!commandInfos.isEmpty()){
+ CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
+ if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
+ continue;//鎸囦护鏈畬鎴�
+ }
}
+
Date now = new Date();
//鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
@@ -1027,6 +1047,29 @@
locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3) {
+
+ //鏇存柊璧峰搴撲綅鐘舵��
+ LocMast locMastStart = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMastStart.setLocSts("K");//O.绌哄簱浣�
+ locMastStart.setBarcode("");//鎵樼洏鐮�
+ locMastStart.setModiTime(now);
+ locMastStart.setModiUser(9999L);
+ locMastService.updateById(locMastStart);
+
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("Z");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+
}
}
}
--
Gitblit v1.9.1