#

lty

4 天以前 f710ee17ec798c2b359a2f635af13269506d628e

 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}")
@@ -1015,6 +1015,7 @@
        } else {
            throw new CoolException("不支持的wkType：" + param.getWkType());
        }
        payload.put("wareHouseId", "WH01");

        try {
            Map<String, Object> res = callMesWkApi(baseUrl, path, headers, payload, bizDesc);
@@ -1138,10 +1139,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);
@@ -1394,6 +1393,7 @@
                param.setOrderNo(order.getOrderNo());
                param.setOrderType(order.getWkType());
                param.setOrderTime(DateUtils.convert(new Date(order.getBusinessTime())));
                param.setWareHouseId(order.getWarehouseId());

                List<DetlDto> detlDtos = new ArrayList<>();
                for (ErpOrderDetl d : details) {
@@ -1522,7 +1522,7 @@
                url,
                request,
                null,
                null,
                request,
                response,
                success
        );