更改给堆垛机下发任务五次，完善第三方日志搜索功能

野心家

2025-03-07 fdfb8877851ef6a3041d654194b98831bb42a68c

更改给堆垛机下发任务五次，完善第三方日志搜索功能

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

@@ -977,15 +977,15 @@
                    // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                    Date now = new Date();
                    taskWrk.setWrkSts(12);
                    taskWrk.setStatus(2);
                    taskWrk.setModiTime(now);
                    if (taskWrkMapper.updateById(taskWrk) == 0) {
                        log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo());
                    }
                    try {
                    String response = "";
                    Boolean bool=false;
                        HashMap<String, Object> headParam = new HashMap<>();
                        headParam.put("TaskNo", taskWrk.getTaskNo());
                        String response;
                    try {
                        response = new HttpHandler.Builder()
                                // .setHeaders(headParam)
                                .setUri(wmsUrl)
@@ -994,17 +994,24 @@
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        if(jsonObject.get("ReturnStatus").equals(0)){
                            bool = true;
                            taskWrk.setStatus(2);
                            taskWrkMapper.updateById(taskWrk);
                        }

                    } catch (Exception e) {
                        log.error("wcs派发移库库任务上报wms失败", taskWrk);
//                        throw new CoolException("wcs派发移库库任务上报wms失败");
                    }finally {
                        apiLogService.save("wcs派发移库任务上报wms"
                                , wmsUrl + taskStatusFeedbackPath
                                , null
                                , "127.0.0.1"
                                , JSON.toJSONString(headParam)
                                , response
                                , true
                                , bool
                        );
                    } catch (Exception e) {
                        log.error("wcs派发移库库任务上报wms失败", taskWrk);
//                        throw new CoolException("wcs派发移库库任务上报wms失败");
                    }

                }

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

@@ -92,6 +92,7 @@
                    HashMap<String, Object> hashMap = new HashMap<>();
                    hashMap.put("TaskNo",taskWrk.getTaskNo());
                    String response = "";
                    Boolean bool = false;
                    try {
                        //开始上报,出库任务开始时，WCS回调WMS
                        response = new HttpHandler.Builder()
@@ -101,13 +102,16 @@
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        Boolean bool = false;

                        if(jsonObject.get("ReturnStatus").equals(0)){
                            bool = true;
                            taskWrk.setMarkStart(1);
                            taskWrk.setStatus(2);
                            taskWrkMapper.updateById(taskWrk);
                        }

                    } catch (Exception e) {
                    }finally {
                        apiLogService.save("wcs开始任务上报wms"
                                , wmsUrl + TaskExecCallback
                                , null
@@ -116,7 +120,6 @@
                                , response
                                , bool
                        );
                    } catch (Exception e) {
                    }
                }
            }

 src/main/webapp/views/apiLog/apiLog.html

@@ -24,12 +24,12 @@
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                            <input class="layui-input layui-laydate-range" name="request" type="text" placeholder="请求内容" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                            <input class="layui-input" type="text" name="response" placeholder="响应内容" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;