From 3b73ea7b24c1281f4ad789a80359d77f8121da33 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:00 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1620332..5a61e26 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -72,7 +72,7 @@
                     taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
                     //鍒ゆ柇鎵樼洏鏄惁璧板埌鍑哄簱绔�
                     BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", taskWrk.getTargetPoint()));
-                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
+                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo()) || !basDevp.getOutEnable().equals("Y")){
                         continue;
                     }
                 } else if (taskWrk.getIoType() ==3) {
@@ -93,7 +93,7 @@
                     locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
                     locMast2.setModiTime(now);
                     locMast2.setModiUser(9999L);
-                    locMastService.updateById(locMast);
+                    locMastService.updateById(locMast2);
                 }
 
                 taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
@@ -109,18 +109,18 @@
                 }catch (Exception e){
                     continue;
                 }
-                apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
-                        ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
-                        ,null
-                        ,"127.0.0.1"
-                        ,JSON.toJSONString(taskOverToWms)
-                        ,response
-                        ,true
-                );
+
 
                 JSONObject jsonObject = JSON.parseObject(response);
                 if (jsonObject.getInteger("code").equals(200)){
-
+                    apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+                            ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
+                            ,null
+                            ,"127.0.0.1"
+                            ,JSON.toJSONString(taskOverToWms)
+                            ,response
+                            ,true
+                    );
                 }else {
                     continue;
                 }

--
Gitblit v1.9.1