Merge branch 'phyzwms2' into phyzasrs-erp

zhangc

2024-11-26 c45d612c0673c5037a12b4a7514b5c52e7ecdbe9

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

@@ -531,9 +531,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");
@@ -541,7 +548,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y,{}", e.getMessage());
        }
        return FAIL;
    }
@@ -705,12 +712,12 @@
                reportMesPakinOrder(agvWrkMast, agvWrkDetls);
            }
        }
        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
        }
        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
            generateMesParam(agvWrkMast, agvWrkDetls);
        }
//        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
//            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
//        }
//        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
//            generateMesParam(agvWrkMast, agvWrkDetls);
//        }
    }

    private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {