*

lsh

1 天以前 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3

*

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

@@ -333,6 +333,8 @@
            vo.setOutEnable(basCrnp.getOutEnable());
            vo.setHpMk(basCrnp.getHpMk());
            vo.setTaskComplete(crnThread.getResetFlag()? "任务完成下发等待":"-");
            vo.setDemo(SystemProperties.WCS_RUNNING_STATUS_DEMO.get()? "开启":"关闭");
            vo.setDemoValue(SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE);
        }
        return R.ok().add(list);
    }

 src/main/java/com/zy/asrs/domain/vo/CrnListVo.java

@@ -115,6 +115,8 @@
    private String hpMk;
    private String taskComplete = "无";
    private String errorCrn;
    private String demo;
    private Integer demoValue;

    public void setXspeed(Float xspeed) {
        this.xspeed = Utils.scale(xspeed);
@@ -150,4 +152,19 @@
        }
        return CrnStatusType.get(this.wrkStatus.shortValue()).desc;
    }

    public String getDemoValue$() {
        switch (this.demoValue) {
            case 0:
                return "停止";
            case 1:
                return "运行启动中";
            case 2:
                return "运行中";
            case 3:
                return "停止中";
            default:
                return "未知状态";
        }
    }
}

 src/main/java/com/zy/asrs/task/TaskLogScheduler.java

@@ -58,51 +58,59 @@
    public void execute() throws IOException {
        List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
        for (TaskWrk taskWrk : taskWrkList) {
            JSONObject jsonObject = null;
            String response = null;
            boolean success = false;
            HashMap<String, Object> map = new HashMap<>();
            try {
                map.put("taskNo",taskWrk.getTaskNo());
                map.put("taskStatus",taskWrk.getStatusWms());
                map.put("ioType",taskWrk.getIoTypeWms());
                map.put("barCode",taskWrk.getBarcode());
                map.put("reportTime", LocalDateTime.now());
                map.put("weight",taskWrk.getScWeight().doubleValue());
                response = new HttpHandler.Builder()
                        .setUri(wmsUrl)
                        .setPath(taskStatusFeedbackPath)
                        .setJson(JSON.toJSONString(map))
                        .build()
                        .doPost();
                jsonObject = JSON.parseObject(response);

                if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                    if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
                        log.error("任务档转任务历史档失败" + taskWrk);
                        return ;
                    }
                    success = true;
                    //删除任务
                    taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
                } else {
                    log.error("wms入库出库完成上报失败" + taskWrk);
            if (taskWrk.getIoType()==4){
                if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
                    log.error("任务档转任务历史档失败" + taskWrk);
                    return ;
                }
            } catch (Exception e) {
                log.error("wms通讯失败," + e.getMessage());
            } finally {
                apiLogService.save("wms入库出库完成上报"
                        , wmsUrl + taskStatusFeedbackPath
                        , null
                        , "127.0.0.1"
                        , JSON.toJSONString(map)
                        , response
                        , success
                );
                success = true;
                //删除任务
                taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
            } else {
                JSONObject jsonObject = null;
                String response = null;
                HashMap<String, Object> map = new HashMap<>();
                try {
                    map.put("taskNo",taskWrk.getTaskNo());
                    map.put("taskStatus",taskWrk.getStatusWms());
                    map.put("ioType",taskWrk.getIoTypeWms());
                    map.put("barCode",taskWrk.getBarcode());
                    map.put("reportTime", LocalDateTime.now());
                    map.put("weight",taskWrk.getScWeight().doubleValue());
                    response = new HttpHandler.Builder()
                            .setUri(wmsUrl)
                            .setPath(taskStatusFeedbackPath)
                            .setJson(JSON.toJSONString(map))
                            .build()
                            .doPost();
                    jsonObject = JSON.parseObject(response);

                    if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                        if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
                            log.error("任务档转任务历史档失败" + taskWrk);
                            return ;
                        }
                        success = true;
                        //删除任务
                        taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
                    } else {
                        log.error("wms入库出库完成上报失败" + taskWrk);
                    }
                } catch (Exception e) {
                    log.error("wms通讯失败," + e.getMessage());
                } finally {
                    apiLogService.save("wms入库出库完成上报"
                            , wmsUrl + taskStatusFeedbackPath
                            , null
                            , "127.0.0.1"
                            , JSON.toJSONString(map)
                            , response
                            , success
                    );
                }
            }
        }


    }

}

 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -32,6 +32,10 @@
                </el-table-column>
                <el-table-column property="errorCrn" label="异常提示">
                </el-table-column>
                <el-table-column property="demo" label="演示">
                </el-table-column>
                <el-table-column property="demoValue$" label="演示状态">
                </el-table-column>
            </el-table>
        </div>

@@ -77,10 +81,10 @@
                            <el-form-item label="测试库位">
                                <el-input v-model="formParam.locMastDemo" placeholder="测试库位 分隔符;"></el-input>
                            </el-form-item>
                            <el-form-item label="目标站/目标库位">
                            <el-form-item label="堆垛机放货站点">
                                <el-input v-model="formParam.staOutDemo" placeholder="堆垛机放货站点"></el-input>
                            </el-form-item>
                            <el-form-item label="目标站/目标库位">
                            <el-form-item label="堆垛机取货站点">
                                <el-input v-model="formParam.staIntDemo" placeholder="堆垛机取货站点"></el-input>
                            </el-form-item>
                        </el-form>