From b0dffb07a0a099245f80a86ba2c68a49b6f0feca Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 16:42:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 7 +++----
src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java | 4 ++--
src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++++-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java b/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
index 91170d9..8366d9b 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
@@ -39,7 +39,7 @@
armList.add(armAgvGratingParam2);
ArmAgvGratingParam armAgvGratingParam3 = new ArmAgvGratingParam();
armAgvGratingParam3.setArmNo(5);
- armAgvGratingParam3.setChannel("A1");
+ armAgvGratingParam3.setChannel("A2");
armList.add(armAgvGratingParam3);
return armList;
case "028440CC031993":
@@ -48,7 +48,7 @@
case "2800201":
ArmAgvGratingParam armAgvGratingParam4 = new ArmAgvGratingParam();
armAgvGratingParam4.setArmNo(5);
- armAgvGratingParam4.setChannel("A2");
+ armAgvGratingParam4.setChannel("A1");
armList.add(armAgvGratingParam4);
return armList;
default:
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 368cdfc..2bb60ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2022/4/9
@@ -1046,7 +1047,11 @@
}
return false;
}else {
- if (basAgvMast.getIoType()==0 && (basAgvMast.getSourceStaNo()==2033 || basAgvMast.getStaNo()==4003)){
+ if (basAgvMast != null
+ && basAgvMast.getIoType() != null
+ && (basAgvMast.getIoType() == 0)
+ && (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
+ || Objects.equals(basAgvMast.getStaNo(), 4003)|| Objects.equals(basAgvMast.getSourceStaNo(), 4006))){
AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
diff --git a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
index 4acad06..0de8683 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
@@ -23,7 +23,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 2));
+ List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status",2));
if (basAgvMastList.isEmpty()) {
return;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index 0c2d420..f1b9202 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -60,15 +60,11 @@
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
-
-
-
LocMast locMast1 = locMastService.selectById(basAgvMast.getLocNo());
List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", basAgvMast.getLocNo()));
if (!locDetls1.isEmpty()) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", basAgvMast.getLocNo()));
}
-
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast1.setLocSts("F");
locMast1.setIoTime(now);
@@ -193,6 +189,9 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
+ if(basAgvMast.getIoType() == 2 && basAgvMast.getFloorNo() == 2){
+ basAgvMast.setStatus(4);
+ }
basAgvMastService.updateById(basAgvMast);
openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 809b938..9e6b5dd 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -128,7 +128,7 @@
return new JSONObject()
.fluentPut("data", new JSONArray(Arrays.asList(
new JSONObject()
- .fluentPut("billno", order.getOrderNo())
+ .fluentPut("billno", UUID.randomUUID().toString().replace("-", ""))
.fluentPut("trdbillno", UUID.randomUUID().toString().replace("-", ""))
.fluentPut("billtype_number", "im_PurInBill_STD_BT_S")
.fluentPut("biztime", sdf1.format(now))
--
Gitblit v1.9.1