From b9e42e18fcc90f53f23fdee06d1ba2caa550f96c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 12 七月 2024 18:25:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +++++++
3 files changed, 11 insertions(+), 1 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 f6ab9e4..6ecfbeb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1179,6 +1179,11 @@
}else if (Cools.isEmpty(param.getWeight())){
throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
}
+ if (param.getDevNo()==131){
+ param.setDevNo(130);
+ } else if (param.getDevNo()==126){
+ param.setDevNo(125);
+ }
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()).eq("color", param.getColor()));
if (locDetls.isEmpty()){
@@ -1190,8 +1195,10 @@
for (LocDetl locDetl : locDetls){
StockOutParam stockOutParam = new StockOutParam(param,locDetl);
workService.startupFullTakeStore(stockOutParam, userId);
+ return;
}
}
+
public void smallContainersJar(SmallCompleteParam param) {
Long userId = 7777L;//mes
//鍒ゆ柇param鍙傛暟
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index b734c78..418127e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -282,7 +282,7 @@
}else if (locMast.getLocSts().equals("F")){
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", 110)
+ .eq("type_no", 101)
.eq("stn_no", param.getOutSite())
.eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 50d9f3d..629f323 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -108,6 +108,9 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ if (Cools.isEmpty(locDetl.getBatch())){
+ locDetl.setBatch("");
+ }
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1