From b6aece51dd963be4daf6090a9a9f6af0717a2832 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:21:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/inOut.js | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/views/pakStore/locDetlQuery.html | 7 ++++++-
src/main/java/com/zy/asrs/controller/MobileController.java | 40 ++++++++++++++++++++++------------------
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4b661c5..aaf62cd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -459,29 +459,33 @@
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
String rStaNo ="E8";
+ String type ="ZONE"; //鍖哄煙
if(barcode.substring(0,1).equals("9")){
rStaNo = "E9";
- }
- String type ="ZONE"; //鍖哄煙
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
- if (config != null) {
- type ="STACK"; //宸烽亾
- if (Cools.isEmpty(config.getValue())) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("1")) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("2")) {
- rStaNo = rStaNo + "02";
- config.setValue("3");
- }else if (config.getValue().equals("3")) {
- rStaNo = rStaNo + "03";
- config.setValue("1");
+ }else{
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
+
+ if (config != null) {
+ type ="STACK"; //宸烽亾
+ if (Cools.isEmpty(config.getValue())) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ }else if (config.getValue().equals("1")) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ }else if (config.getValue().equals("2")) {
+ rStaNo = rStaNo + "02";
+ config.setValue("3");
+ }else if (config.getValue().equals("3")) {
+ rStaNo = rStaNo + "03";
+ config.setValue("1");
+ }
+ configService.updateById(config);
}
- configService.updateById(config);
}
+
+
LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 61c2dc6..b35811c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -91,6 +91,9 @@
<if test="matnr!=null and matnr!='' ">
and a.matnr like '%' + #{matnr} + '%'
</if>
+ <if test="zpallet!=null and zpallet!='' ">
+ and a.zpallet like '%' + #{zpallet} + '%'
+ </if>
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
</if>
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index e7dff96..14132e8 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -98,7 +98,7 @@
success: function (res) {
layer.closeAll();
if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
+ table.exportFile(titles,res.data.records,'xls');
} else if (res.code === 403) {
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 6f46989..1f2f9af 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -74,7 +74,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鍚堝悓鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
--
Gitblit v1.9.1