From 40c2cf86b517ca4049d51d7ca72299fccab0e0f6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Tue, 25 Feb 2025 16:41:12 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=9B=9E=E4=BC=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InAndOutRetrunServiceImpl.java       |  2 ++
 .../st/returns/wql/QST_IVT_INANDOUTRETRUN.wql |  8 +++++
 .../src/views/wms/st/inAndOutReturn/index.vue | 34 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 03ba23639..7a01f1afe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -62,6 +62,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
         map.put("bill_status", MapUtil.getStr(whereJson, "bill_status"));
         map.put("bill_type", MapUtil.getStr(whereJson, "bill_type"));
         map.put("is_upload", MapUtil.getStr(whereJson, "is_upload"));
+        map.put("upload_mes", MapUtil.getStr(whereJson, "upload_mes"));
+        map.put("upload_sap", MapUtil.getStr(whereJson, "upload_sap"));
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         if (StrUtil.isNotEmpty(begin_time)) {
             map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
index 503c8882e..e16262171 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
@@ -21,6 +21,8 @@
 	输入.stor_id					        TYPEAS s_string
 	输入.bill_status					    TYPEAS s_string
 	输入.is_upload					    TYPEAS s_string
+	输入.upload_mes					    TYPEAS s_string
+	输入.upload_sap					    TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
 	输入.vbeln					        TYPEAS s_string
@@ -96,6 +98,12 @@
                    OPTION 输入.is_upload <> ""
                        mst.is_upload = 输入.is_upload
                    ENDOPTION
+                   OPTION 输入.upload_mes <> ""
+                      mst.upload_mes = 输入.upload_mes
+                  ENDOPTION
+                  OPTION 输入.upload_sap <> ""
+                        mst.upload_sap = 输入.upload_sap
+                    ENDOPTION
                    OPTION 输入.begin_time <> ""
                        mst.input_time >= 输入.begin_time
                    ENDOPTION
diff --git a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
index 3dde7c437..076973ecb 100644
--- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
@@ -139,6 +139,40 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否回传MES">
+            <el-select
+              v-model="query.upload_mes"
+              clearable
+              size="mini"
+              placeholder="是否回传"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.is_upload"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否回传SAP">
+            <el-select
+              v-model="query.upload_sap"
+              clearable
+              size="mini"
+              placeholder="是否回传"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.is_upload"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"