From bd1a2aef7fbe13e920c473b4f5e7ff5ba942c9a8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 11:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 0cfdb7f..6df2d13 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
@@ -63,11 +63,14 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 0)
.eq("loc_sts", "F")
- .eq("pack_status", 5));
+ .eq("loc_type1",(short)2)
+ .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()));
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (Cools.isEmpty(locDetl)){
log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁鏄庣粏");
} else if (Cools.isEmpty(locDetl.getDeadWarn())){
@@ -76,7 +79,9 @@
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 (Cools.isEmpty(mat)){
+ log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
+ } else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -86,8 +91,12 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo(107); // 婧愮珯
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ if (wrkMast.getCrnNo()==1){
+ wrkMast.setSourceStaNo(203); // 婧愮珯
+ }else {
+ wrkMast.setSourceStaNo(210); // 婧愮珯
+ }
wrkMast.setStaNo(104); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -122,6 +131,7 @@
combParam.setPackNo(locMast.getBarcode());
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