From d8339416fdc4f5846ad35215d38bd73a6bb93695 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 21 五月 2025 13:57:00 +0800
Subject: [PATCH] 工作号改成唯一的

---
 src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java |    2 +-
 src/main/java/com/zy/common/web/WcsController.java           |    3 ++-
 2 files changed, 3 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 68e69a0..05e3fab 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -52,7 +52,7 @@
 
         List<WorkIssuedResult.Tasks> tasks = new ArrayList<>();
         WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
-        task.setTaskId(wrkMast.getWrkNo().toString());
+        task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime());
         task.setBarCode(wrkMast.getBarcode());
         task.setOrder(i);
 
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4225924..ee11139 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -321,7 +321,8 @@
     @PostMapping("/fromwcs/task")
     @ResponseBody
     public Re status(@RequestBody StatusParam statusParam) {
-        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
+        String[] wrkNo=statusParam.getTaskId().split("-",2);
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.parseInt(wrkNo[0])));
         if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
             return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟");
         }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){

--
Gitblit v1.9.1