From 806185c1616f541067957d1b4428f0c10a7d5ed5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 五月 2023 16:37:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 dee9a46..b0fc8b7 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -44,7 +44,7 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
- private ApiLogService apiLogService;
+ private MatService matService;
@Autowired
private CommonService commonService;
@Autowired
@@ -64,20 +64,24 @@
.eq("fire_status", 0)
.eq("loc_sts", "F")
.eq("loc_type1",(short)2)
- .eq("pack_status", 6));
+ .eq("pack_status", 5)
+ .eq("freeze",0));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
- 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 (now.getTime()-locMast.getModiTime().getTime() >= locDetl.getDeadWarn()*60*1000){
+ }else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -124,9 +128,10 @@
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.setRequestTime(DateUtils.convert(new Date()));
new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
--
Gitblit v1.9.1