From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 114 +++++++++++++++++++++++---------------------------------
1 files changed, 47 insertions(+), 67 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 1ab186d..f1af496 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,25 @@
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.asrs.utils.PostMesDataUtils;
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 +39,13 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
private WaitPakinService waitPakinService;
@Autowired
private WaitPakinLogService waitPakinLogService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
@Value("${mes.url}")
private String mesUrl;
@@ -65,15 +59,48 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
-// ReturnT<String> result = null;
-// if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
-// result = postMesData(wrkMast,inpath,1);
-// } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
-// result = postMesData(wrkMast,outPath,2);
-// }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ ReturnT<String> result = null;
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
+ if(wrkDetl != null){
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMaktx());
+// combParam.setLocNo(wrkMast.getLocNo());
+// combParam.setPackSts(1);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ if (pakin!=null){
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+ }
+ } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
+// if(wrkDetl != null){
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMatnr());
+// combParam.setLocNo(wrkMast.getSourceLocNo());
+//// combParam.setPackSts(0);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,outPath,combParam);
+// }
+ }
// if(null != result && !result.isSuccess()){
// return result;
// }
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -96,53 +123,6 @@
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
- private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath,int a){
- 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()));
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(mesUrl)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
}
return SUCCESS;
}
--
Gitblit v1.9.1