From 936eec28271690fe40fd85cba87bcd8274bb11b3 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期五, 26 九月 2025 15:32:24 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/webapp/views/order/outUQ.html | 6 +++---
src/main/java/com/zy/common/properties/SystemProperties.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 9 ++++++---
src/main/resources/license.lic | 0
src/main/webapp/views/order/outMes.html | 6 +++---
src/main/webapp/views/order/outReturn.html | 6 +++---
6 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index a248063..1d0b240 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2025-09-26 08:00:00";
+ String timeStr = "2099-09-26 08:00:00";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fe43f14..c269c0f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -175,11 +175,14 @@
.gt("bay1",columnNum));
// 娣卞簱浣嶆病鏈夊垯鎼滅储娴呭簱浣�
- if (locMasts.isEmpty()) {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// if (locMasts.isEmpty()) {
+ List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts","O").in("crn_no",crnNoList).in("row1","2,3,6,7,10,11,14,15,18,19,22,23").orderBy("lev1,bay1,row1")
.gt("bay1",columnNum));
- }
+ if(!locMasts2.isEmpty()) {
+ locMasts.addAll(locMasts2);
+ }
+// }
if (locMasts.isEmpty()) {
throw new CoolException("娌℃湁鍙敤搴撲綅");
}
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 72952e9..cae0a39 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/views/order/outMes.html b/src/main/webapp/views/order/outMes.html
index e23d6e0..5e1cc05 100644
--- a/src/main/webapp/views/order/outMes.html
+++ b/src/main/webapp/views/order/outMes.html
@@ -78,9 +78,9 @@
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
+<!-- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
+<!-- <i class="layui-icon"></i>閲嶇疆-->
+<!-- </button>-->
</div>
</div>
</form>
diff --git a/src/main/webapp/views/order/outReturn.html b/src/main/webapp/views/order/outReturn.html
index 53daa71..752a241 100644
--- a/src/main/webapp/views/order/outReturn.html
+++ b/src/main/webapp/views/order/outReturn.html
@@ -78,9 +78,9 @@
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
+<!-- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
+<!-- <i class="layui-icon"></i>閲嶇疆-->
+<!-- </button>-->
</div>
</div>
</form>
diff --git a/src/main/webapp/views/order/outUQ.html b/src/main/webapp/views/order/outUQ.html
index 64dbdc2..dba9ce0 100644
--- a/src/main/webapp/views/order/outUQ.html
+++ b/src/main/webapp/views/order/outUQ.html
@@ -78,9 +78,9 @@
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
+<!-- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
+<!-- <i class="layui-icon"></i>閲嶇疆-->
+<!-- </button>-->
</div>
</div>
</form>
--
Gitblit v1.9.1