修复库位类型字段错误并优化工作档状态检查逻辑

zhangc

2024-12-06 03b0ea7369dcba72b560ec80f941f9d29ff7b9a5

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -26,6 +26,7 @@

import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@Slf4j
@@ -207,6 +208,7 @@
//                            if (!flowLogService.insert(flowLog)) {
//                                throw new CoolException("同步半成品调拨单流水记录失败");
//                            }
                            log.info("53添加库存日志:{},{}", updateAnfme,JSON.toJSON(agvLocDetl));
                            agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
                        }
                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
@@ -224,6 +226,7 @@
                        agvLocDetl.sync(agvWrkDetl);
                        agvLocDetl.setModiTime(now);
                        agvLocDetl.setAppeTime(now);
                        log.info("57添加库存日志:{}",JSON.toJSON(agvLocDetl));
                        if (!agvLocDetlService.insert(agvLocDetl)) {
                            throw new CoolException("保存工作明细失败");
                        }
@@ -289,6 +292,7 @@
                        locDetl.setLocNo(agvWrkMast.getLocNo());
                        locDetl.sync(agvWrkDetl);
                        locDetl.setModiTime(new Date());
                        log.info("112添加库存日志:{}",JSON.toJSON(locDetl));
                        agvLocDetlService.insert(locDetl);
                    }
                    // 接驳位 -- 库位
@@ -530,9 +534,16 @@
                throw new CoolException("任务下发失败");
            }

            agvWrkMast.setWrkSts(202L);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMast.setWrkSts(202L);
            //agvWrkMast.setModiTime(new Date());
            //boolean b = agvWrkMastService.updateById(agvWrkMast);
            boolean b = agvWrkMastService.updateWrkStsByWrkNo(Math.abs(agvWrkMast.getWrkNo()), 202L);
            if (!b) {
                log.info("更新任务状态失败,{}", agvWrkMast.getWrkNo());
                throw new CoolException("更新任务状态失败");
            } else {
                log.info("更新任务状态成功,{}", agvWrkMast.getWrkNo());
            }
            if (agvWrkMast.getIoType() == 1) {
                //修改AGV入库通知档状态入出状态为Y
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
@@ -540,7 +551,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y,{}", e.getMessage());
        }
        return FAIL;
    }
@@ -746,7 +757,7 @@

            } else {
                MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
                mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                mesPakinReportParam.setBizType("0");
                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
                mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
@@ -868,7 +879,7 @@
        boolean success = false;

        try {
            response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            response = new HttpHandler.Builder().setUri(url).setPath(path).setTimeout(30, TimeUnit.SECONDS).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            JSONObject jsonObject = JSON.parseObject(response);

            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {