From cdcfca91ded792ab73f786a81cdccde8475b3e0c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 十月 2023 16:03:51 +0800
Subject: [PATCH] #新增许可证
---
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
index 6df2d13..2d4a44e 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -67,21 +67,21 @@
.eq("pack_status", 5)
.eq("freeze",0));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
- //闈欑疆瀹屾垚鍑哄簱绔�104
+ //闈欑疆瀹屾垚鍑哄簱绔�103
for(LocMast locMast : locMasts){
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (Cools.isEmpty(locDetl)){
+ if (Cools.isEmpty(locDetl) || Cools.isEmpty(locDetl.getMatnr())){
log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁鏄庣粏");
- } else if (Cools.isEmpty(locDetl.getDeadWarn())){
- log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁闈欑疆鏃堕棿");
+ continue;
+ }
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
+ }else if (Cools.isEmpty(mat.getDeadWarn())){
+ log.error("pack:"+mat.getMatnr()+"娌℃湁闈欑疆鏃堕棿");
} else if (Cools.isEmpty(locMast.getModiTime())){
log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
- } else if (Cools.isEmpty(locMast.getBarcode())){
- log.error("搴撲綅:"+locMast.getLocNo()+"Pack鐮佷负绌�");
- } else if (Cools.isEmpty(mat)){
- log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
- } else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
+ }else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -97,7 +97,7 @@
}else {
wrkMast.setSourceStaNo(210); // 婧愮珯
}
- wrkMast.setStaNo(104); // 鐩爣绔�
+ wrkMast.setStaNo(103); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -126,12 +126,11 @@
locMast.setLocSts("R");
locMast.setModiTime(now);
locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
-
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(mat.getMatnr());
combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(6);
- combParam.setStepSts(1);
+ combParam.setPackSts(1);
+ combParam.setStepSts(6);
combParam.setRequestTime(DateUtils.convert(new Date()));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
--
Gitblit v1.9.1