From 2a610a7b1d04df61768567a5651fd34e7c99cde9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 三月 2024 12:55:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 d4114f4..2d4a44e 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -1,23 +1,33 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.PostMesDataUtils;
+import com.zy.common.constant.MesConstant;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -34,9 +44,17 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
+ private MatService matService;
+ @Autowired
private CommonService commonService;
@Autowired
private WrkDetlService wrkDetlService;
+
+ @Value("${mes.url}")
+ private String mesUrl;
+
+ @Value("${mes.inPath}")
+ private String inpath;
@Transactional
public ReturnT<String> start() {
@@ -45,20 +63,25 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 0)
.eq("loc_sts", "F")
- .eq("pack_status", 4));
+ .eq("loc_type1",(short)2)
+ .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()));
- 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));
// 鐢熸垚宸ヤ綔妗�
@@ -68,9 +91,13 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo(107); // 婧愮珯
- wrkMast.setStaNo(104); // 鐩爣绔�
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ if (wrkMast.getCrnNo()==1){
+ wrkMast.setSourceStaNo(203); // 婧愮珯
+ }else {
+ wrkMast.setSourceStaNo(210); // 婧愮珯
+ }
+ wrkMast.setStaNo(103); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -98,7 +125,15 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
- locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+ locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(mat.getMatnr());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setStepSts(6);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
}
--
Gitblit v1.9.1