From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 669978a..2a2127c 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,7 +51,7 @@
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}else {
- wrapper.orderBy("modi_time", false).orderBy("wrk_no", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -64,11 +64,19 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ if (entry.getKey().equals("io_type")) {
+ wrapper.eq("io_type", val);
+ } else if(entry.getKey().equals("wrk_sts")){
+ wrapper.eq("wrk_sts", val);
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+
}
}
}
+
@RequestMapping(value = "/wrkMastLog/add/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
public R add(WrkMastLog wrkMastLog) {
--
Gitblit v1.9.1