From a7f0ee46f5a1b0ec8cf7bd3d0701bde6c09de24f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 16:33:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index a131caf..a4e411b 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -200,8 +200,11 @@
if (basCrnp.getCrnSts()!=3 || !basCrnp.getOutEnable().equals("Y")){
continue;
}
+ if (!basCrnpService.checkSiteError(crnNo, false)){
+ continue;
+ }
// 鑾峰彇搴撲綅
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo).orderBy("lev1",true).orderBy("bay1",true));
for (LocMast locMastS : locMasts){
List<String> locNoList = new ArrayList<>();
sign = true;
@@ -241,14 +244,20 @@
sign=false;
}
}
+ ArrayList<String> locArrayList = new ArrayList<>();
+ for (String locNo : locNoList){
+ if (!locArrayList.contains(locNo)){
+ locArrayList.add(locNo);
+ }
+ }
if (sign) {
EmptyPlateOutParam param = new EmptyPlateOutParam();
param.setOutSite(staNo);
- param.setLocNos(locNoList);
+ param.setLocNos(locArrayList);
try{
workService.emptyPlateOut(param, 9999L);
}catch (Exception e){
- log.error("浜屾ゼ灏忔枡绠辫嚜鍔ㄨˉ绌烘澘澶辫触锛侊紒寮傚父鍘熷洜锛�"+e);
+ log.error(staNo+"鑷姩琛ョ┖鏉垮け璐ワ紒锛佸紓甯稿師鍥狅細"+e);
}
return SUCCESS;
}
--
Gitblit v1.9.1