还原代码

zhangchao

2024-11-08 441c5bd409702bfd9e9ad5f660229c804863ae56

还原代码

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -285,16 +285,16 @@
            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
                throw new CoolException("调用AGV响应错误");
                //return code;
            }
            success = true;
            return code;
        }catch (Exception e){
            log.error(e.getMessage());
            //TODO 张超
            //throw new CoolException("调用AGV响应错误");
            return 1;
            throw new CoolException("调用AGV响应错误");
            //return 1;
        }finally {
            apiLogService.save(
                    namespace,

 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;

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

@@ -131,8 +131,8 @@
            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
                throw new CoolException("调用AGV响应错误");
                //return code;
            }
            success = true;
            return code;

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8083
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
    #url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
    url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
    username: sa
    password: sa@123
  mvc:
@@ -87,12 +87,19 @@
u8:
  url: http://192.168.9.3:8877
  orderReportPath: /DBMS/U8/CM/add
ERP:
  url: http://39.184.149.30:8877
  orderReportPath: /DBMS/U8/CM/add
MES:
  url: http://192.168.1.55:8010
  orderReportPath: /api/RdAudit
#ERP:
#  url: http://39.184.149.30:8877
#  orderReportPath: /DBMS/U8/CM/add
mes:
  url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
  orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
  pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
  buyPakinReportPath: /schedule-for-yinzuo/open/yinzuo/inboundOrder
  pakoutReportPath: /inventory/open/v2/outbound_order/_outbound_by_suggest
  getTokenUrl: https://v3-ali.blacklake.cn
  getTokenPath: /api/openapi/domain/api/v1/access_token/_get_access_token
  appKey: cli_1712644281065780
  appSecret: 6710d24e31e64adc963d4c213b2c9b8e

agvBasDev:
  maxWorkNum: 1