From 8c890f686ae2060c4c2e6afebce6c69c493c2e04 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:23:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   84 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 77 insertions(+), 7 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 b78196a..df8a73b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,22 +1,32 @@
 package com.zy.asrs.task.handler;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
+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.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.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.*;
+
 /**
  * Created by vincent on 2020/7/6
  */
+@Slf4j
 @Service
 public class WorkLogHandler extends AbstractHandler<String> {
 
@@ -28,10 +38,70 @@
     private WrkDetlService wrkDetlService;
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private LocMastService locMastService;
+    @Autowired
+    private WaitPakinService waitPakinService;
+    @Autowired
+    private WaitPakinLogService waitPakinLogService;
+
+    @Value("${mes.url}")
+    private String mesUrl;
+
+    @Value("${mes.inPath}")
+    private String inpath;
+
+    @Value("${mes.outPath}")
+    private String outPath;
 
     @Transactional
     public ReturnT<String> start(WrkMast wrkMast) {
         try {
+            /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+            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.getZpallet());
+//                    combParam.setPackName(wrkDetl.getMatnr());
+                    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.getZpallet());
+//                    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())) {
                 exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -49,11 +119,11 @@
 //                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
         } catch (Exception e) {
+            log.error("fail", e);
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }
-
 }

--
Gitblit v1.9.1