1
zhang
2026-01-24 87f8618e3bb8bcc769884225238fb1d4d02afb43
1
6个文件已修改
41 ■■■■■ 已修改文件
zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/resources/application.yml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-cv/src/main/java/com/zy/asrs/controller/vo/StationStatus.java
@@ -9,7 +9,7 @@
    private String staNo;
    private String seqNum;
    private String taskNo;
    private Boolean conveyable;
}
zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
@@ -29,7 +29,7 @@
    @Scheduled(cron = "0 0 2 * * ?")
    public void autoToLog() {
        List<Job> jobs = jobMapper.listJobByJobSts(5);
        List<Job> jobs = jobMapper.listJobByJobSts(6);
        for (Job job : jobs) {
            jobService.saveJobLog(job);
        }
zy-acs-cv/src/main/java/com/zy/asrs/service/CtuMainService.java
@@ -36,4 +36,6 @@
    void createTake(Integer mark);
    void fakeWms(Integer mark);
}
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -278,11 +278,7 @@
                        Job job = jobMapper.getJobByJobNo(staProtocol.getWorkNo());
                        if (job != null && job.getJobSts() == 4) {
                            job.setJobSts(5);
                            job.setRcsTime(new Date());
                            jobMapper.updateById(job);
                            if (!fakeWms(staProtocol)) {
                                throw new CoolException("任务发送给RCS失败," + job.getSeqNum() + " - " + job.getSeqNum());
                            }
                        }
                    }
                }
@@ -293,21 +289,36 @@
        }
    }
    public boolean fakeWms(StaProtocol staProtocol) {
    @Transactional
    public synchronized void fakeWms(Integer mark) {
        List<Job> jobs = jobMapper.listJobByJobSts(5);
        for (Job job : jobs) {
        OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
        openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
        List<TaskDto> taskList = new ArrayList<>();
        TaskDto taskDto = new TaskDto();
        taskDto.setSeqNum("SSX-RK" + staProtocol.getWorkNo());
            taskDto.setSeqNum("SSX-RK" + job.getJobNo());
        taskDto.setOriSta("1007");
        taskDto.setPriority(9527);
        taskList.add(taskDto);
        openBusSubmitParam.setTaskList(taskList);
        return sendTask(openBusSubmitParam, staProtocol);
            boolean b = sendTask(openBusSubmitParam);
            if (b){
                job.setJobSts(6);
                job.setRcsTime(new Date());
                jobMapper.updateById(job);
                log.info("任务发送给RCS成功," + job.getSeqNum() + " - " + job.getJobNo());
            }else {
                log.info("任务发送给RCS失败," + job.getSeqNum() + " - " + job.getJobNo());
            }
        }
    }
    @Transactional
    public boolean sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
    public boolean sendTask(OpenBusSubmitParam openBusSubmitParam) {
        String response = "";
        try {
            response = new HttpHandler.Builder()
@@ -356,7 +367,7 @@
                for (StationStatus object : stationStatuses) {
                    if (object.getStaNo().equals(staNo + "")) {
                        if (object.getConveyable()) {
                            return object.getSeqNum() == null ? System.currentTimeMillis() + "" : object.getSeqNum();
                            return object.getTaskNo();
                        } else {
                            log.info("站点:{}状态不对", staNo);
                            return null;
zy-acs-cv/src/main/java/com/zy/core/CtuMainProcess.java
@@ -61,7 +61,8 @@
                    // 创建任务
                    ctuMainService.createTake(50);
                    // 模拟WMS入库流程
                    ctuMainService.fakeWms(60);
                } catch (Exception e) {
                    e.printStackTrace();
                }
zy-acs-cv/src/main/resources/application.yml
@@ -31,7 +31,8 @@
#    field-strategy: 0
logging:
  path: /stock/out/cv/logs
  file:
    path: /stock/logs
super:
  pwd: xltys1995