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/handler/WCSReportHandler.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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);
--
Gitblit v1.9.1