From 7714207440d4774b84b6490406bdebf228c1fee6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 24 十二月 2025 16:01:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 64997b7..a908e6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1249,9 +1249,9 @@
.eq("matnr", param.getMatnr())
.eq("weight", param.getWeight());
if (param.getDevNo() == 536){
- wrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo())
- .orderBy("appe_time", true);
+// .eq("model", param.getTaskNo())
+// .eq("specs", param.getOrderNo())
+ wrapper.orderBy("appe_time", true);
} else {
wrapper.orderBy("batch", true);
}
@@ -1278,8 +1278,9 @@
.and()
.gt("weight", param.getWeight());
if (param.getDevNo() == 536){
- locDetlWrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo())
+// .eq("model", param.getTaskNo())
+// .eq("specs", param.getOrderNo())
+ locDetlWrapper
.orderBy("appe_time", true)
.orderBy("weight", true);
} else {
@@ -1308,8 +1309,9 @@
.and()
.lt("weight", param.getWeight());
if (param.getDevNo() == 536){
- locDetlWrapper.eq("model", param.getModel())
- .eq("specs", param.getOrderNo())
+// .eq("model", param.getTaskNo())
+// .eq("specs", param.getOrderNo())
+ locDetlWrapper
.orderBy("appe_time", true)
.orderBy("weight", false);
} else {
--
Gitblit v1.9.1