From e2d6a43d4f7d083233896755573d2c55444fb66f Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 14 三月 2025 09:40:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index 327ca4c..c3c5024 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -51,35 +51,35 @@ private String wmsUrl; @Value("${wms.movePath}") private String movePath; + @Value("${wms.inboundTaskApplyPath}") + private String inboundTaskApplyPath; + @Value("${wms.TaskExecCallback}") + private String TaskExecCallback; + @Value("${wms.taskStatusFeedbackPath}") + private String taskStatusFeedbackPath; + /** + * 鍏ュ嚭搴撲换鍔¤浆鍘嗗彶妗� + * @throws IOException + */ @Scheduled(cron = "0/3 * * * * ? ") public void execute() throws IOException { - for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) { - TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk); - if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚 - //鍖哄垎鍏ュ嚭搴� - TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk); - if(!wrkLogService.insert(taskWrkLog)){ - throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog); - } - if(!taskWrkService.deleteById(taskWrk)){ - throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog); - } - } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) { - taskStatusFeedbackParam.setTaskStatus("cancelled"); - //new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk); + //鍏ュ簱7杞巻鍙叉。,绉诲簱7杞巻鍙叉。,鍑哄簱18杞� + List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().in("wrk_sts", 7,18)); + for (TaskWrk taskWrk : taskWrkList) { + TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk); + if(taskWrkLog.getIoType().equals(2)){ + taskWrkLog.setWrkSts(19); + }else{ + taskWrkLog.setWrkSts(8); } - - if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) { - //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織 - commandInfoService.saveToHistory(taskWrk.getTaskNo()); - - //鍒犻櫎浠诲姟 - taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo())); - //鍒犻櫎鎸囦护 - commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo())); + taskWrkLog.setModiTime(new Date()); + if (!wrkLogService.insert(taskWrkLog)) { + throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog); + } + if (!taskWrkService.deleteById(taskWrk)) { + throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog); } } } - } -- Gitblit v1.9.1