From b615f55d1ad0c7f61bc02e18ed0245a4158376e8 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 14 一月 2025 14:18:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 840b025..f1e4b82 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1236,7 +1236,10 @@
}
ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
- Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight());
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
+ .eq("matnr", param.getMatnr())
+ .eq("weight", param.getWeight())
+ .orderBy("batch", true);
if (param.getDevNo() == 536) {
wrapper.eq("model", param.getModel())
.eq("specs", param.getOrderNo());
@@ -1263,6 +1266,7 @@
.lt("weight", param.getWeight() + mat.getUnits())
.and()
.gt("weight", param.getWeight())
+ .orderBy("batch", true)
.orderBy("weight", true);
if (param.getDevNo() == 536){
locDetlWrapper.eq("model", param.getModel())
@@ -1288,6 +1292,7 @@
.gt("weight", param.getWeight() - mat.getUnits())
.and()
.lt("weight", param.getWeight())
+ .orderBy("batch", true)
.orderBy("weight", false);
if (param.getDevNo() == 536){
locDetlWrapper.eq("model", param.getModel())
--
Gitblit v1.9.1