From d3ec5053e76f534775e450f538eb11db0082b747 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 15 Jul 2024 12:30:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E5=88=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java    | 6 +++++-
 .../java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index f6f281a35..bcda608c3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -1923,7 +1923,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
         JSONArray arr = new JSONArray();
         JSONObject resultParam = new JSONObject();
         resultParam.put("ContainerName", ContainerName);
-        resultParam.put("ResourceName", "");
+        if (one.getResource_name().startsWith("B50")){
+            resultParam.put("ResourceName", "B50CZ00001");
+        }else {
+            resultParam.put("ResourceName", "B60CZ00001");
+        }
         resultParam.put("Weight", one.getWeight());
         resultParam.put("WeighDate", DateUtil.now());
         resultParam.put("Type", one.getPaper_tube_or_FRP());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
index e007311de..665ec1b48 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
@@ -309,7 +309,7 @@
                 		AND task_status < '07'
                 	AND is_delete = '0'
                 	)
-                    ORDER BY sort_seq desc
+                    ORDER BY in_order_seq desc
                 ENDSELECT
             ENDQUERY
         ENDIF
\ No newline at end of file