From 562c18ed0b3ac91589cf8d23511981675f59fabd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 18 十二月 2023 16:08:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4347bc1..2438af2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -150,7 +150,7 @@
                 ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                 ,null
                 ,"127.0.0.1"
-                ,JSON.toJSONString(param)
+                ,JSON.toJSONString(toWmsDTO)
                 ,response
                 ,true
         );
@@ -175,12 +175,19 @@
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .lt("crn_stn",200));
+                        .lt("stn_no",200));
+            }else if (param.getWharfSource().contains("H")){
+                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                        .eq("crn_no",data.getTaskTunnel())
+                        .eq("type_no",1)
+                        .lt("stn_no",400)
+                        .gt("stn_no",200));
             }else {
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .ge("crn_stn",200));
+                        .lt("stn_no",500)
+                        .ge("stn_no",400));
             }
             map1.put("taskTunnel", staDesc.getStnDesc());
             //map1.put("taskTunnel", "J-1104");

--
Gitblit v1.9.1