From e15139e4ec5daffb4e4d4a8e48fb1237baeb5fad Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 14:02:03 +0800
Subject: [PATCH] 新增电视机显示小车异常异常信息提示
---
src/main/java/com/zy/common/web/WcsController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c74b117..d293842 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -58,15 +58,19 @@
WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no",param.getTaskNo())
.in("io_type",103,107));
- if (Cools.isEmpty(wrkMast)){
+ WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_no",param.getTaskNo())
+ .in("io_type",53,57));
+ if (Cools.isEmpty(wrkMast)&&Cools.isEmpty(wrkMast537)){
storageResult.setReturnStatus(1);
storageResult.setErrorMessage("娌℃湁鎵惧埌鐩樼偣鎷ｆ枡浠诲姟---------"+param.getTaskNo());
return storageResult;
}
+
SearchLocParam searchLocParam = new SearchLocParam();
- searchLocParam.setBoxNo(wrkMast.getBarcode());
+ searchLocParam.setBoxNo(Cools.isEmpty(wrkMast)?wrkMast537.getBarcode() : wrkMast.getBarcode());
searchLocParam.setWcsIoType(1);//婊℃澘
- searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo());
+ searchLocParam.setWcsSourceStaNo(Cools.isEmpty(wrkMast)?wrkMast537.getSourceStaNo() : wrkMast.getStaNo());
searchLocParam.setWcsStatus(0);
return getLocNo(searchLocParam);
}
--
Gitblit v1.9.1