From a6480edc1d366bfeead1eb2784be13ae747e3f23 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 五月 2025 17:12:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java           |    2 +-
 src/main/java/com/zy/asrs/entity/TaskWrk.java                  |   11 +++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java    |    8 ++++----
 src/main/java/com/zy/asrs/controller/TaskWrkController.java    |    4 ++--
 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java |    2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index d0f9338..e5c5556 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -264,7 +264,7 @@
         try{
             HashMap<String, Object> headParam = new HashMap<>();
             headParam.put("taskNo",taskWrk.getTaskNo());
-            headParam.put("taskStatus",taskWrk.getStatus());
+            headParam.put("taskStatus",taskWrk.getStatusWms());
             headParam.put("ioType",taskWrk.getIoTypeWms());
             headParam.put("barCode",taskWrk.getBarcode());
             headParam.put("reportTime", LocalDateTime.now());
@@ -325,7 +325,7 @@
         try{
             HashMap<String, Object> headParam = new HashMap<>();
             headParam.put("taskNo",taskWrk.getTaskNo());
-            headParam.put("taskStatus",taskWrk.getStatus());
+            headParam.put("taskStatus",taskWrk.getStatusWms());
             headParam.put("ioType",taskWrk.getIoTypeWms());
             headParam.put("barCode",taskWrk.getBarcode());
             headParam.put("reportTime", LocalDateTime.now());
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 9aa5f1d..9a52081 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -376,6 +376,17 @@
         }
     }
 
+    public Integer getStatusWms(){
+        switch (status){
+            case 5:
+                return 1;
+            case 4:
+                return 0;
+            default:
+                return 0;
+        }
+    }
+
     public String getPut(String point){
         String[] split = point.split("-");
         if (split.length == 5){
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 278627a..077784a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -813,7 +813,7 @@
                     try {
                         HashMap<String, Object> headParam = new HashMap<>();
                         headParam.put("taskNo",taskWrk.getTaskNo());
-                        headParam.put("taskStatus",taskWrk.getStatus());
+                        headParam.put("taskStatus",taskWrk.getStatusWms());
                         headParam.put("ioType",taskWrk.getIoTypeWms());
                         headParam.put("barCode",taskWrk.getBarcode());
                         headParam.put("reportTime", LocalDateTime.now());
@@ -936,7 +936,7 @@
                             try {
                                 HashMap<String, Object> headParam = new HashMap<>();
                                 headParam.put("taskNo",taskWrk.getTaskNo());
-                                headParam.put("taskStatus",taskWrk.getStatus());
+                                headParam.put("taskStatus",taskWrk.getStatusWms());
                                 headParam.put("ioType",taskWrk.getIoTypeWms());
                                 headParam.put("barCode",taskWrk.getBarcode());
                                 headParam.put("reportTime", LocalDateTime.now());
@@ -1043,7 +1043,7 @@
                     try {
                         HashMap<String, Object> headParam = new HashMap<>();
                         headParam.put("taskNo",taskWrk.getTaskNo());
-                        headParam.put("taskStatus",taskWrk.getStatus());
+                        headParam.put("taskStatus",taskWrk.getStatusWms());
                         headParam.put("ioType",taskWrk.getIoTypeWms());
                         headParam.put("barCode",taskWrk.getBarcode());
                         headParam.put("reportTime", LocalDateTime.now());
@@ -1160,7 +1160,7 @@
                     try {
                         HashMap<String, Object> headParam = new HashMap<>();
                         headParam.put("taskNo",taskWrk.getTaskNo());
-                        headParam.put("taskStatus",taskWrk.getStatus());
+                        headParam.put("taskStatus",taskWrk.getStatusWms());
                         headParam.put("ioType",taskWrk.getIoTypeWms());
                         headParam.put("barCode",taskWrk.getBarcode());
                         headParam.put("reportTime", LocalDateTime.now());
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 40c5155..a1003f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -144,7 +144,7 @@
             try{
                 HashMap<String, Object> headParam = new HashMap<>();
                 headParam.put("taskNo",taskWrk.getTaskNo());
-                headParam.put("taskStatus",taskWrk.getStatus());
+                headParam.put("taskStatus",taskWrk.getStatusWms());
                 headParam.put("ioType",taskWrk.getIoTypeWms());
                 headParam.put("barCode",taskWrk.getBarcode());
                 headParam.put("reportTime", LocalDateTime.now());
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d4ea5de..174fbdf 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -63,7 +63,7 @@
             HashMap<String, Object> map = new HashMap<>();
             try {
                 map.put("taskNo",taskWrk.getTaskNo());
-                map.put("taskStatus",taskWrk.getStatus());
+                map.put("taskStatus",taskWrk.getStatusWms());
                 map.put("ioType",taskWrk.getIoTypeWms());
                 map.put("barCode",taskWrk.getBarcode());
                 map.put("reportTime", LocalDateTime.now());

--
Gitblit v1.9.1