#

Junjie

9 天以前 d128431c79255f8ab7290fc3302685df8fcd157e

#

 src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java

@@ -18,6 +18,7 @@
import java.util.HashMap;
import java.util.List;

import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -553,8 +554,10 @@
                return false;
            }

            Random random = new Random();

            String barcodeTime = String.valueOf(System.currentTimeMillis());
            String barcode = barcodeTime.substring(5);
            String barcode = String.valueOf(random.nextInt(10)) + String.valueOf(random.nextInt(10)) + barcodeTime.substring(7);

            boolean result = updateStationData(lockTaskNo, currentStationId, currentStationDeviceNo, null, null, null, barcode, null);
            if (!result) {

 src/main/java/com/zy/core/plugin/FakeProcess.java

@@ -378,6 +378,10 @@
                    redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 5);

                    String response = wmsOperateUtils.applyInTask(stationProtocol.getBarcode(), stationProtocol.getStationId(), stationProtocol.getPalletHeight());
                    if (response == null) {
                        News.error("请求WMS入库接口失败，接口未响应！！！response：{}", response);
                        continue;
                    }
                    JSONObject jsonObject = JSON.parseObject(response);
                    if (jsonObject.getInteger("code").equals(200)) {
                        StartupDto dto = jsonObject.getObject("data", StartupDto.class);

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -425,6 +425,10 @@
        if (shallowLocMast.getLocSts().equals("F")) {
            //浅库位状态有货,申请更换库位
            String response = wmsOperateUtils.applyChangeLocNo(shallowLocNo);
            if (response == null) {
                News.taskError(taskNo, "WCS申请在库库位更换库位失败，WMS接口未响应！！！response：{}", response);
                return false;
            }
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("code").equals(200)) {
                StartupDto dto = jsonObject.getObject("data", StartupDto.class);

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -247,6 +247,10 @@
                        //站点处于重新分配库位区域
                        //运行堵塞，重新申请任务
                        String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo());
                        if (response == null) {
                            News.taskError(wrkMast.getWrkNo(), "请求WMS重新分配库位接口失败，接口未响应！！！response：{}", response);
                            continue;
                        }
                        JSONObject jsonObject = JSON.parseObject(response);
                        if (jsonObject.getInteger("code").equals(200)) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);

 src/main/java/com/zy/core/utils/WmsOperateUtils.java

@@ -24,6 +24,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;

@Component
public class WmsOperateUtils {
@@ -75,11 +76,12 @@
                    .setUri(wmsUrl)
                    .setPath(wmsSystemInUrl)
                    .setJson(JSON.toJSONString(requestParam))
                    .setTimeout(360, TimeUnit.SECONDS)
                    .build()
                    .doPost();
            News.info("请求WMS接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemInUrl, JSON.toJSONString(requestParam), response);
            News.info("请求WMS入库接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemInUrl, JSON.toJSONString(requestParam), response);
        } catch (Exception e) {
            News.error("请求WMS接口异常！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemInUrl, JSON.toJSONString(requestParam), response, e);
            News.error("请求WMS入库接口异常！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemInUrl, JSON.toJSONString(requestParam), response, e);
        } finally {
            HttpRequestLog httpRequestLog = new HttpRequestLog();
            httpRequestLog.setName(wmsUrl + wmsSystemInUrl);
@@ -131,11 +133,12 @@
                    .setUri(wmsUrl)
                    .setPath(wmsSystemReassignInTaskUrl)
                    .setJson(JSON.toJSONString(requestParam))
                    .setTimeout(360, TimeUnit.SECONDS)
                    .build()
                    .doPost();
            News.info("请求WMS接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response);
            News.info("请求申请任务重新分配入库接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response);
        } catch (Exception e) {
            News.error("请求WMS接口异常！！！url：{}；request：{}； response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response, e);
            News.error("请求申请任务重新分配入库接口异常！！！url：{}；request：{}； response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response, e);
        } finally {
            HttpRequestLog httpRequestLog = new HttpRequestLog();
            httpRequestLog.setName(wmsUrl + wmsSystemReassignInTaskUrl);
@@ -196,13 +199,14 @@
                    .setUri(wmsUrl)
                    .setPath(wmsSystemChangeLocNoUrl)
                    .setJson(JSON.toJSONString(requestParam))
                    .setTimeout(360, TimeUnit.SECONDS)
                    .build()
                    .doPost();
            News.info("请求WMS接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemChangeLocNoUrl, JSON.toJSONString(requestParam), response);
            News.info("请求WMS申请更换库位接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemChangeLocNoUrl, JSON.toJSONString(requestParam), response);

            return response;
        } catch (Exception e) {
            News.error("请求WMS接口异常！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemChangeLocNoUrl, JSON.toJSONString(requestParam), response, e);
            News.error("请求WMS申请更换库位接口异常！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemChangeLocNoUrl, JSON.toJSONString(requestParam), response, e);
        } finally {
            HttpRequestLog httpRequestLog = new HttpRequestLog();
            httpRequestLog.setName(wmsUrl + wmsSystemChangeLocNoUrl);