1

zhang

2 天以前 7799b4f8c962ca4b5dbb9a6a58fb9a855b833e03

1

 src/main/java/com/zy/asrs/entity/wms/StorageEscalationParam.java

@@ -15,6 +15,9 @@
    //错误信息   具体的错误信息（超高，超重等）
    private String WCSErrorMessage = "";

    //是否满板
    private Integer fullPlt;

    // 物料号列表
    private List<String> matIdList;
}

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

@@ -181,17 +181,22 @@
                        }
                        storageEscalationParam.setBarcode(BoxNo);
                        storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
                        storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
                        log.info("组托入库={}", storageEscalationParam);
                        TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
                        if (taskWrk == null) {
                            log.error("入库请求wms创建任务工作档为空：{}", storageEscalationParam);
                            continue;
                        } else {
                            if (-1 == taskWrk.getWrkNo()) {
                                back = true;
                            }
                        }
                        if (back) {
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.info("组托入库托盘退回命令推送输送线队列成功==>{}，{}", BoxNo, errMsg);
                            log.info("组托入库托盘退回命令推送输送线队列成功==>{}，{}，{}", BoxNo, errMsg, taskWrk.getWrkNo());
                        } else {
                            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                                    .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));

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

@@ -112,14 +112,18 @@
                    .doPost();
            if (!Cools.isEmpty(response)) {
                JSONObject jsonObject = JSON.parseObject(response);
                if (successCode.equals(jsonObject.get(code).toString())) {
                if ("700".equals(jsonObject.get(code).toString())) {
                    TaskWrk taskWrk=new TaskWrk();
                    taskWrk.setWrkNo(-1);
                    return taskWrk;
                } else if (successCode.equals(jsonObject.get(code).toString())) {
                    WmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
                    return createInTask(result, wmsParam.getBarcode(), wmsParam.getStationCode());
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            log.info("请求wms报错，入参：{},异常：{}",JSON.toJSONString(wmsParam), e.getMessage());
            log.info("请求wms报错，入参：{},异常：{}", JSON.toJSONString(wmsParam), e.getMessage());
        } finally {
            addApiLog("入库任务请求获取库位", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success);
        }
@@ -132,9 +136,9 @@
        boolean bool = false;
        JSONObject param = new JSONObject();
        try {
            log.info("任务执行状态上报，任务号：{}，执行状态：{}", taskNo,wrkSts);
            param.put("taskNo",taskNo);
            param.put("wrkSts",wrkSts);
            log.info("任务执行状态上报，任务号：{}，执行状态：{}", taskNo, wrkSts);
            param.put("taskNo", taskNo);
            param.put("wrkSts", wrkSts);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(wmsUrl)
@@ -147,7 +151,7 @@
            }

        } catch (Exception e) {
            log.error("任务执行状态上报异常" +  e);
            log.error("任务执行状态上报异常" + e);
        } finally {
            apiLogService.save("任务状态上报"
                    , wmsUrl + executionStatusReport