Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

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

@@ -353,11 +353,7 @@
        }
        //TODO
        //暂时加上trycatch
        try {
            reportMes(agvWrkMast, agvWrkDetlListOld);
        } catch (Exception e) {
            e.printStackTrace();
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -517,7 +513,7 @@
            log.error("" + e.getMessage());
        }
        //TODO 张超
        //reportMes(agvWrkMast, agvWrkDetlListOld);
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -542,7 +538,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }
@@ -870,7 +866,7 @@
            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
                log.info("mes接口调用失败，返回信息：" + jsonObject);
                //TODO 张超
                //throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
                throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
            }
            success = true;
            return jsonObject;