#

lty

昨天 efa60bb5326cff17c59c102af9aab71e62b76b2e

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -108,6 +108,7 @@
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
        log.info("{}接口被访问","/order/matSync/default/v1");
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -119,6 +120,7 @@
    @PostMapping("/erp/mat/sync")
    public synchronized R erpMatSync(@RequestBody(required = false) List<Map<String, Object>> body,
                                     HttpServletRequest request) {
        log.info("{}接口被访问","/erp/mat/sync");
        auth(null, body, request);
        if (Cools.isEmpty(body)) {
            return R.parse(BaseRes.PARAM);
@@ -140,6 +142,7 @@
            orders = new ArrayList<>();
            orders.add(dto);
        }
        log.info("{}接口被访问","/erp/order/addPrd");
        auth(null, orders, request);
        if (Cools.isEmpty(orders)) {
            return R.parse(BaseRes.PARAM);
@@ -158,6 +161,7 @@
            orders = new ArrayList<>();
            orders.add(dto);
        }
        log.info("{}接口被访问","/erp/order/addQc");
        auth(null, orders, request);
        if (Cools.isEmpty(orders)) {
            return R.parse(BaseRes.PARAM);
@@ -176,6 +180,7 @@
            orders = new ArrayList<>();
            orders.add(dto);
        }
        log.info("{}接口被访问","/erp/order/addSrm");
        auth(null, orders, request);
        if (Cools.isEmpty(orders)) {
            return R.parse(BaseRes.PARAM);
@@ -186,6 +191,7 @@
    @PostMapping("/MES/inventory/details")
    public synchronized R mesInventoryDetails(@RequestBody(required = false) Map<String, Object> param,
                                              HttpServletRequest request) throws IOException {
        log.info("{}接口被访问","/MES/inventory/details");
        auth(null, param, request);
        if (param == null) {
            param = new HashMap<>();
@@ -196,6 +202,7 @@
    @PostMapping("/MES/inventory/summary")
    public synchronized R mesInventorySummary(@RequestBody(required = false) Map<String, Object> param,
                                              HttpServletRequest request) throws IOException {
        log.info("{}接口被访问","/MES/inventory/summary");
        auth(null, param, request);
        if (param == null) {
            param = new HashMap<>();
@@ -206,7 +213,7 @@
    @PostMapping("/MES/orderReport")
    public synchronized R orderReport(@RequestBody(required = false) OrderReportParam param,
                                              HttpServletRequest request) throws IOException {
        auth(null, param, request);
//        auth(null, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
@@ -221,6 +228,7 @@
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {
        log.info("{}接口被访问","/order/pakin/default/v1");
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -245,6 +253,7 @@
    public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
                                             @RequestBody(required = false) OpenOrderCompleteParam param,
                                             HttpServletRequest request) {
        log.info("{}接口被访问","/order/pakin/complete/default/v1");
        auth(appkey, param, request);
        return R.ok().add(openService.pakinOrderComplete(param));
    }
@@ -257,6 +266,7 @@
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        log.info("{}接口被访问","/order/pakout/default/v1");
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -287,6 +297,7 @@
    public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody(required = false) OpenOrderCompleteParam param,
                                              HttpServletRequest request) {
        log.info("{}接口被访问","/order/pakout/complete/default/v1");
        auth(appkey, param, request);
        return R.ok().add(openService.pakoutOrderComplete(param));
    }
@@ -298,6 +309,7 @@
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        log.info("{}接口被访问","/stock/default/v1");
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }

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

@@ -75,10 +75,10 @@
    @Autowired
    private PlatformTransactionManager transactionManager;

    @Value("${mes-wk.base-url.test:http://192.168.0.41}")
    @Value("${mes-wk.base-url.test:http://192.168.0.41:8080}")
    private String mesWkBaseUrlTest;

    @Value("${mes-wk.base-url.prod:http://192.168.0.42}")
    @Value("${mes-wk.base-url.prod:http://192.168.0.42:8080}")
    private String mesWkBaseUrlProd;

    @Value("${mes-wk.auth.ent-code:lfd}")
@@ -1138,10 +1138,8 @@
                return "http://" + v;
            }
        }

        String wkType = param != null ? param.getWkType() : null;
        String norm = wkType == null ? "" : wkType.trim().toLowerCase();
        if (norm.contains("test") || norm.contains("41") || norm.contains("测试")) {
        boolean result = true;
        if (result) {
            return normalizeHttpBaseUrl(mesWkBaseUrlTest);
        }
        return normalizeHttpBaseUrl(mesWkBaseUrlProd);
@@ -1522,7 +1520,7 @@
                url,
                request,
                null,
                null,
                request,
                response,
                success
        );

 src/main/resources/application.yml

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