From 43bf799fc85e18923480b5877e01b46dab28606f Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 16:19:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d50a892..a9d19e0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -3,31 +3,24 @@
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.LocDetl;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.parser.JJTCCJSqlParserState;
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.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/7/6
@@ -45,13 +38,9 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private WaitPakinLogService waitPakinLogService;
- @Autowired
- private OrderService orderService;
- @Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LocMastService locMastService;
@Value("${mes.url}")
private String mesUrl;
@@ -65,15 +54,49 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
ReturnT<String> result = null;
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
- result = postMesData(wrkMast,inpath);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(1);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()))){
+ throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if(wrkDetl != null){
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetl.getZpallet());
+ combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocno(wrkMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(inpath,combParam);
+ }
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- result = postMesData(wrkMast,outPath);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(0);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()))){
+ throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if(wrkDetl != null){
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(wrkDetl.getZpallet());
+ combParam.setPackName(wrkDetl.getMatnr());
+ combParam.setLocno(wrkMast.getLocNo());
+ combParam.setPackSts(null);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(outPath,combParam);
+ }
}
if(null != result && !result.isSuccess()){
return result;
}
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -100,19 +123,16 @@
return SUCCESS;
}
- private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath){
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
- combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
+ if(combParam != null){
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
+ Map<String, Object> map = new HashMap<>();
+ map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder().setHeaders(map)
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
@@ -146,4 +166,5 @@
}
return SUCCESS;
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1