From ba15ec7be47104b796f2098eedfbe9feb9c0ffc5 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期四, 15 一月 2026 09:45:57 +0800
Subject: [PATCH] 修改页面AGV工作档历史逻辑
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index 468d906..54e1104 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -978,6 +978,10 @@
set.add(mesOutApplyItem.getTrayid());
Mat mat = matService.selectByMatnr(mesOutApplyItem.getItemno());
+ if (Cools.isEmpty(mat)) {
+ log.error("鐗╂枡缂栧彿涓嶅瓨鍦�: {}", mesOutApplyItem.getItemno());
+ throw new CoolException("鐗╂枡缂栧彿涓嶅瓨鍦�: " + mesOutApplyItem.getItemno());
+ }
OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
orderDetlPakout.setOrderId(orderPakout.getId());
orderDetlPakout.setOrderNo(orderPakout.getOrderNo());
@@ -1108,7 +1112,9 @@
Date now = new Date();
Task task = new Task();
task.setWrkNo(workNo);
- task.setTaskType("ZX-AGV");
+ //08-1鏄┖鎵樼洏杞簭浠诲姟
+ //08-2鏄墿鏂欒浆搴忎换鍔�
+ task.setTaskType("ZX-AGV-"+transTask.getTransType());
task.setWrkSts(301L);//301.AGV浠诲姟鍒涘缓
task.setIoType(3);//3.绔欏埌绔�
task.setIoPri(10.00);
@@ -1232,7 +1238,7 @@
if ("Y".equals(allow.getStatus())) {
String TaskNo = allow.getTaskno();
if(allow.getTaskno().contains("-")){
- TaskNo = allow.getTaskno().split("-")[0];
+ TaskNo = allow.getTaskno().substring(0, allow.getTaskno().length() - 2);
}
Task task = taskService.selectOne(new EntityWrapper<Task>().eq("task_no", TaskNo));
if (Cools.isEmpty(task)) {
@@ -1324,7 +1330,7 @@
if ("Y".equals(allow.getStatus())) {
String TaskNo = allow.getTaskno();
if(allow.getTaskno().contains("-")){
- TaskNo = allow.getTaskno().split("-")[0];
+ TaskNo = allow.getTaskno().substring(0, allow.getTaskno().length() - 2);
}
Task task = taskService.selectOne(new EntityWrapper<Task>().eq("task_no", TaskNo));
if (Cools.isEmpty(task)) {
--
Gitblit v1.9.1