From 0fcdcd462ce021473201a0b3b33563426f3ddda4 Mon Sep 17 00:00:00 2001 From: LGH <1746689524@qq.com> Date: Fri, 8 Jul 2022 19:55:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mt/wms/empty/controller/ApmsController.java | 2 +- .../main/java/com/mt/wms/empty/task/AsynRunTaskService.java | 1 + .../src/main/java/com/mt/wms/empty/task/ScheduledTask.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java index d63a6a3..991e1f7 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java @@ -50,7 +50,7 @@ public class ApmsController extends BaseController { // static String Token = "eyJhbGciOiJIUzI1NiJ9.eyJkYXRlIjozMTkyNzU4NDk4ODA3LCJwbGF0Rm9ybUlkIjoyLCJhcGlLZXkiOiI3ZWU4ZjU5YmJhZWFlMjdlIiwiZXhwIjozMTkyNzU4NDk4LCJpYXQiOjE2Mzc1NTg0OTh9.RH3MRQr1dCBYW996-WXN69eXu1ZFblAQHfhZHNbTmCg"; static String Token = ""; static LocalDateTime TokenExpireTime = LocalDateTime.now(); - static String ApiAddress = "http://59.110.171.25:9010"; + static String ApiAddress = "http://59.110.171.25:80"; @PostMapping(value = "apmsPostOrder") @ApiOperation(value = "WMS接收APMS推送订单信息") diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java index 9e19563..74d9ad1 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java @@ -1093,5 +1093,6 @@ public class AsynRunTaskService extends BaseService { if (apmsStartProcessR.getCode() != 0) { logger.info("任务号" + currTask.getTaskCode() + "生产单号：" + currTask.getSheetNo() + "生产单开始生产上报apms失败"); } + logger.info("任务号" + currTask.getTaskCode() + "生产单号：" + currTask.getSheetNo() + "生产单开始生产上报apms成功"); } } diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java index 573a980..8526761 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java @@ -77,7 +77,7 @@ public class ScheduledTask extends BaseService { @Test public void test() throws IOException { } - //@Scheduled(fixedDelay = 1000*60) + @Scheduled(fixedDelay = 1000*60) public void testWebsocket() throws IOException { //查询出正在进炉加工的curr_task,查询对应炉号是否Working,查询计划时间，剩余时间，查询标识卡详情 List currTaskList = currTaskServiceBiz.list(new QueryWrapper().eq(CurrTask.IS_IN, 1)); @@ -179,7 +179,7 @@ public class ScheduledTask extends BaseService { /** * 查询加工完成的窑炉 */ - @Scheduled(fixedDelay = 1000*60*2) + //@Scheduled(fixedDelay = 1000*60*2) public void taskForStockToKiln() throws IOException { //两辆车是否都空闲，只有两辆车都空闲才被允许做任务 List vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper().eq(VehicleInfo.STATUS, 0));