From 9c7e5bc10f242b71f3d94e2c700cb7de79feda17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 25 二月 2025 08:45:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 +++++++++-
1 files changed, 9 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..6de36df 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())
@@ -1331,6 +1336,9 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", singleLoc));
if (locMast.getLocSts().equals("F")){
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", singleLoc));
+ if (Cools.isEmpty(locDetl1)){
+ throw new CoolException("搴撲綅"+locMast.getLocNo()+"寮傚父锛屽湪搴撲絾鏄棤搴撳瓨锛侊紒锛�");
+ }
if (!locS.contains(locDetl1.getLocNo())){
if (locDetl1.getMatnr().equals(locDetl.getMatnr())){
locDetlArrayAnd.add(locDetl1);
--
Gitblit v1.9.1