#

LSH

2023-05-16 2bf65500161ae37c120d0d9af8f6d8dd7afdec75

 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);
//            }
//            if(null != result && !result.isSuccess()){
//                return result;
//            }
            /*...........................赣州新增..............以下.............赣州新增...........................*/
            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())) {
@@ -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("请求接口失败！！！url：{}；request：{}；response：{}", 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;
    }