From 8376b10e8758f4d9121ac1253a405179c75f0913 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 12:35:40 +0800
Subject: [PATCH] 将物料保质期字段改为寿命,并显示出来 新增物料同步的时候判断有无库存,无则修改有则返回
---
src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
index f3dd197..02bf153 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -487,13 +487,13 @@
mesService.outStation(apply);
// agv缁х画鎵ц
// 婧愮珯鐐规槸浜х嚎锛岀绔欏畬鎴愬悗缁檙cs鍙嶉缁х画鎵ц
- if(task.getSourceStaNo().contains("TOOL")) {
- TransInOutStationAllow inOutStationAllow = new TransInOutStationAllow();
- inOutStationAllow.setTaskno(robotTaskCode);
- inOutStationAllow.setStatus("Y");
- inOutStationAllow.setAgvCode(singleRobotCode);
- mesService.allowOutStation(inOutStationAllow);
- }
+// if(task.getSourceStaNo().contains("TOOL")) {
+// TransInOutStationAllow inOutStationAllow = new TransInOutStationAllow();
+// inOutStationAllow.setTaskno(robotTaskCode);
+// inOutStationAllow.setStatus("Y");
+// inOutStationAllow.setAgvCode(singleRobotCode);
+// mesService.allowOutStation(inOutStationAllow);
+// }
}
} break;
case ARRIVE_ON_STATION: {
@@ -527,6 +527,9 @@
if(transType.equals("01") && arrivalStation.getStationID().contains("XL") || arrivalStation.getStationID().contains("TOOL")) {
path = "ToolArrivalNotice";
}
+ if (arrivalStation.getStationID().startsWith("LG") || arrivalStation.getStationID().startsWith("LT")) {
+ path = "Aprs/" + path;
+ }
mesService.arriveOnStation(arrivalStation,path);
} break;
default: {} break;
--
Gitblit v1.9.1