From 30eec1f6c7424fa5864b7f04abc55683071133e7 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 10:32:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 124 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 23 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..eeaf75d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -6,12 +6,11 @@
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.entity.param.Review;
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;
@@ -52,6 +51,10 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LocMastService locMastService;
+
+ private MobileServiceImpl mobileService;
@Value("${mes.url}")
private String mesUrl;
@@ -62,18 +65,55 @@
@Value("${mes.outPath}")
private String outPath;
+ @Value("${mes.startUpTestPACK}")
+ private String startUpTestPACK;
+
@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);
-// }
-// if(null != result && !result.isSuccess()){
-// return result;
-// }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ ReturnT<String> result = null;
+ if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
+ 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,1,combParam);
+ }
+ } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
+ 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(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ result = postMesData(outPath,2,combParam);
+ }
+ }
+ if(null != result && !result.isSuccess()){
+ return result;
+ }
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -100,15 +140,10 @@
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()));
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+
+ private ReturnT<String> postMesData(String mesPath,int a,Object combParam){
+ if(combParam != null){
String response = "";
boolean success = false;
try {
@@ -120,7 +155,18 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- success = true;
+ if (a==4 && a==3){
+ if (jsonObject.getDate("isComplete").equals(true)){
+ success = true;
+ }else if (jsonObject.getDate("isComplete").equals(false)){
+ success = false;
+ }else {
+ log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ throw new CoolException("杩斿洖鍊煎嚭閿�");
+ }
+ }else {
+ success = true;
+ }
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -146,4 +192,36 @@
}
return SUCCESS;
}
+
+ @Transactional
+ public ReturnT<String> startUpTestPACK(TestMast testMast){
+ try {
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(testMast.getLocNo());
+ combParam.setPackName(testMast.getUserId());
+ combParam.setLocno(testMast.getBarcode());
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(outPath,3,combParam);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ @Transactional
+ public ReturnT<String> suspendTestPACK(){
+ try {
+ Review review=new Review();
+ review.setPause(true);
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(outPath,4,review);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1