From e003f5bb31c6f113a4f6d3820bcaf23376ddd61d Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 七月 2024 10:17:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 3e0c7e0..3b41da0 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -221,9 +221,9 @@
String[] batch2 = batch1[1].split("瑙勬牸锛�");
batch = batch2[0];
// List<Order> orders = orderService.selectorderNoL(batch);
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).orderBy("io_time",false));
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)){
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).orderBy("io_time",false));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)){
return R.error("鏈煡鍒版暟鎹�");
}
@@ -245,10 +245,13 @@
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
+ String[] batch1 = batch.split("绠卞彿锛�");
+ String[] batch2 = batch1[1].split("瑙勬牸锛�");
+ batch = batch2[0];
String orderNo = "";
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).orderBy("io_time",false));
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)) {
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).orderBy("io_time",false));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�");
}
--
Gitblit v1.9.1