From 44e348ebe046ffd40e53ba8bb199838117c8b298 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 14 七月 2024 10:19:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 12 +++++++++---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
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 01ed37a..9c3460a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1263,7 +1263,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
-// waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setBatch(param.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
// waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
// waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(basDevp.getBarcode()); //鎵樼洏鐮�
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 54a3146..8f71dfd 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -104,7 +104,7 @@
private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Integer devNo = 272;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard272"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 266).le("dev_no", devNo).eq("loading", "Y"));
int count = 5;
@@ -119,7 +119,7 @@
private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤�
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Integer devNo = 445;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard445"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 422).le("dev_no", devNo).eq("loading", "Y"));
int count = 20;
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..dfa3eac 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -201,7 +201,7 @@
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 +241,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