From 4fccd3709649b7b7ab43d6f8a6c62fd72b3123c6 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期六, 21 六月 2025 15:54:16 +0800 Subject: [PATCH] 完善 --- src/main/java/com/zy/asrs/task/WCSReportScheduler.java | 2 +- src/main/java/com/zy/common/utils/HttpHandler.java | 2 +- src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 12 ++++++++++-- src/main/resources/application.yml | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WCSReportScheduler.java b/src/main/java/com/zy/asrs/task/WCSReportScheduler.java index 2f6b33a..6853dd3 100644 --- a/src/main/java/com/zy/asrs/task/WCSReportScheduler.java +++ b/src/main/java/com/zy/asrs/task/WCSReportScheduler.java @@ -29,7 +29,7 @@ * 涓嬪彂浠诲姟缁橶CS */ @Scheduled(cron = "0/3 * * * * ? ") - public void execute (){ + public synchronized void execute (){ if (!workIssuedFig){ return; } diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java index 05e3fab..622ddf8 100644 --- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.WrkMast; import com.zy.asrs.entity.result.WorkIssuedResult; @@ -40,7 +41,7 @@ @Autowired private WrkMastService wrkMastService; - public ReturnT<String> start(WrkMast wrkMast,int i) { + public synchronized ReturnT<String> start(WrkMast wrkMast,int i) { WorkIssuedResult workIssuedResult = new WorkIssuedResult(); Date date = new Date(); @@ -52,7 +53,14 @@ List<WorkIssuedResult.Tasks> tasks = new ArrayList<>(); WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks(); - task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime()); + if(Cools.isEmpty(wrkMast.getMemo())){ + task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime()); + wrkMast.setMemo(wrkMast.getWrkNo().toString()+"-"+new Date().getTime()); + wrkMastService.updateById(wrkMast); + }else { + task.setTaskId(wrkMast.getMemo()); + } + task.setBarCode(wrkMast.getBarcode()); task.setOrder(i); diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java index 70adcc7..e912adc 100644 --- a/src/main/java/com/zy/common/utils/HttpHandler.java +++ b/src/main/java/com/zy/common/utils/HttpHandler.java @@ -15,7 +15,7 @@ */ public class HttpHandler { - private static final Integer DEFAULT_TIMEOUT_SECONDS = 5; + private static final Integer DEFAULT_TIMEOUT_SECONDS = 15; private static final MediaType MEDIA_TYPE = MediaType.parse("application/json;charset=utf-8"); private String uri; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0f4ab7b..a5236b2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -88,7 +88,7 @@ switch: boo: false address: - url: http://220.189.244.250:10082 + url: http://192.168.150.200:10082 outaddressSave: hmxtapi/Yh_SP/TiJiaoShuJu_AnNui cxaddress: hmxtapi/Yh_SP/d12_0102 -- Gitblit v1.9.1