From 7ee9a0cf8b068c368d9760e25b8c90a6297ab7a3 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 19 十一月 2024 16:42:03 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/webapp/static/js/order/out.js | 2 +-
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 3 +++
zy-asrs-wms/src/main/webapp/views/order/out.html | 9 ++++-----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index c21451f..f15cdc8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -835,6 +835,9 @@
}
for (OrderDetl o : orderDetls
) {
+ if(o.getAnfme().equals(o.getQty())){
+ continue;
+ }
for (LocDetl l : locDetls
) {
if (o.getMatnr().equals(l.getMatnr())) {
diff --git a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
index f40461f..e38beeb 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
@@ -52,7 +52,7 @@
url: baseUrl+'/mat/page/auth',
page: true,
limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
+ limits: [16, 30, 50, 100, 200, 500,1000,2000],
toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-105',
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/out.js b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
index 75370e2..3c8d992 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/out.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -24,7 +24,7 @@
url: baseUrl+'/orderDetl/pakout/list/auth',
page: true,
limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
+ limits: [15, 30, 50, 100, 200, 500,1000,2000],
toolbar: '#orderDetToolbar',
height: 'full-120',
where: {order_id: 9999999999},
diff --git a/zy-asrs-wms/src/main/webapp/views/order/out.html b/zy-asrs-wms/src/main/webapp/views/order/out.html
index 90aa791..6cfbb8b 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/out.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/out.html
@@ -196,11 +196,10 @@
<span name="locNo"
{{# if( d.lack === false){ }}
class="layui-badge layui-badge-green" >{{d.locNo}}</span>
- {{# else if( d.locNo === '鍦ㄥ钩搴�'){ }}
- class="layui-badge layui-badge-green" >{{d.locNo}}</span>
- {{# } }}
- {{# } else { }}
- class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span>
+ {{# }else if(d.locNo === '鍦ㄥ钩搴�'){ }}
+ class="layui-badge layui-badge-blue" >鍦ㄥ钩搴�</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span>
{{# } }}
</script>
--
Gitblit v1.9.1