From dbae31a7a7cd59048ada9b51fe8faff545324c59 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 三月 2024 16:02:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 13 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 d4f93e1..9a781a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -181,6 +181,7 @@
continue;
}
String barcode = barcodeThread.getBarcode();
+ staProtocol.setBarcode(barcode);
if(!Cools.isEmpty(barcode)) {
StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
@@ -193,8 +194,7 @@
if (Cools.isEmpty(taskWrk)){
continue;
}
- List<Integer> list = new ArrayList<>();
- list.add(taskWrk.getCrnNo());
+
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
@@ -218,7 +218,18 @@
toWmsDTO.setWarehouseId("1688469798893297665");
toWmsDTO.setContainerCode(barcode);
toWmsDTO.setApplyType("TUNNEL_LOCATION");
- toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
+ List<Integer> list = new ArrayList<>();
+
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+ toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
+ list.add(taskWrk.getCrnNo());
+ }else {
+ toWmsDTO.setTaskTunnel(inSta.getBarcode());
+ list.add(inSta.getBarcode());
+ }
+
+
+
toWmsDTO.setCanInboundTunnels(list);
String response = null;
try {
@@ -322,9 +333,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()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+
}
}
@@ -792,6 +812,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()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
}
}
}
@@ -991,41 +1019,67 @@
}
//鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
- 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();
//鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
if (taskWrk.getIoType() == 1) {
//鍏ュ簱浠诲姟
- taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
- //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setLocSts("Z");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
} else if (taskWrk.getIoType() == 2) {
//鍑哄簱浠诲姟
- taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
-// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setLocSts("K");//O.绌哄簱浣�
locMast.setBarcode("");//鎵樼洏鐮�
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