#

zjj

2024-01-10 3b73ea7b24c1281f4ad789a80359d77f8121da33

#

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

@@ -207,11 +207,11 @@
            if (taskWrk == null) {
                return R.error();
            }
            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {
                return R.error(taskWrk.getTaskNo() + "已完结");
            }
            Date now = new Date();
            taskWrk.setStatus(TaskStatusType.COMPLETE.id);
            taskWrk.setStatus(TaskStatusType.OVER.id);
            taskWrk.setModiTime(now);//操作时间
            try{
                taskWrk.setModiUser(getUserId());//操作员

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

@@ -424,6 +424,21 @@
                if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
                    continue;
                }
                // 修改工作档状态 2.设备上走 => 3.吊车入库中
                log.error("进入修改工作档流程");
                Date now = new Date();
                taskWrk.setWrkSts(3);
                taskWrk.setModiTime(now);
                if (taskWrkMapper.updateById(taskWrk) == 0) {
                    log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", taskWrk.getWrkNo());
                }
                TaskWrk taskWrk2 = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());

                if (taskWrk2.getWrkSts() != 3){
                    continue;
                }
                log.error("进入修改工作档流程完成,taskWrk=", JSON.toJSONString(taskWrk));


                //取出命令
                List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
@@ -438,13 +453,6 @@
                if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
                } else {
                    // 修改工作档状态 2.设备上走 => 3.吊车入库中
                    Date now = new Date();
                    taskWrk.setWrkSts(3);
                    taskWrk.setModiTime(now);
                    if (taskWrkMapper.updateById(taskWrk) == 0) {
                        log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", taskWrk.getWrkNo());
                    }
                    //开始运行
                    String response = CrnStartRunning(taskWrk);
                    JSONObject jsonObject = JSON.parseObject(response);
@@ -967,7 +975,7 @@
            try {
                taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
            } catch (CoolException e) {
                log.info(e.getMessage());
//                log.info(e.getMessage());
            }
        }
    }

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

@@ -109,18 +109,18 @@
                }catch (Exception e){
                    continue;
                }
                apiLogService.save("Wms任务完成接口"
                        ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
                        ,null
                        ,"127.0.0.1"
                        ,JSON.toJSONString(taskOverToWms)
                        ,response
                        ,true
                );


                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)){

                    apiLogService.save("Wms任务完成接口"
                            ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
                            ,null
                            ,"127.0.0.1"
                            ,JSON.toJSONString(taskOverToWms)
                            ,response
                            ,true
                    );
                }else {
                    continue;
                }

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 9090
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=ghtzasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghtzasrs
    username: sa
    password: sa@123
  mvc: