From f28b3a9131d2313a889f4a3156dcfabcefce7a84 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 30 十二月 2023 13:41:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index 6fd09a8..04283ca 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -43,8 +43,14 @@
}
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMast::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge(WrkMast::getIoTime, DateUtils.convert(range[0]));
+ wrapper.le(WrkMast::getIoTime, DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("wrk_no"))) {
+ wrapper.eq(WrkMast::getWrkNo, param.get("wrk_no"));
+ }
+ if (!Cools.isEmpty(param.get("wrk_sts"))) {
+ wrapper.eq(WrkMast::getWrkSts, param.get("wrk_sts"));
}
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1