From 44d51d79370da8973fcd52203c669da9d0a1e479 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 31 十二月 2024 10:00:37 +0800
Subject: [PATCH] 并板入库，并板途中拣料，拣料途中并板，以及相关查询接口
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 8 ++++++--
1 files changed, 6 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..7e0bec4 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,7 +64,11 @@
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("manu_type")) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
--
Gitblit v1.9.1