From 85bb0d60ce25ec902aba8c298931bda33a77e7b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 11:59:35 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++++++------
src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java | 4 +++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java b/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
index 088f935..b4e968e 100644
--- a/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
@@ -29,6 +29,8 @@
this.startSta = wrkMast.getSourceStaNo().toString();
this.endSta = wrkMast.getStaNo().toString();
this.status = wrkMast.getWrkSts().intValue();
- this.error.add(wrkMast.getErrorMemo());
+ if (!Cools.isEmpty(wrkMast.getErrorMemo())){
+ this.error.add(wrkMast.getErrorMemo());
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 9cface6..d8f1040 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -204,12 +204,14 @@
List<WrkMast> wrkMastlistA = new ArrayList<>();
List<WrkMast> wrkMastlistB = new ArrayList<>();
for (BasDevpPosition basDevpPosition : basDevpPositionsListUN){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no", basDevpPosition.getDevNo()).eq("wrk_sts",1L));
- if (!Cools.isEmpty(wrkMast)){
- if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN,wrkMast.getSourceStaNo(),wrkMast.getStaNo())){
- wrkMastlistA.add(wrkMast);
- } else {
- wrkMastlistB.add(wrkMast);
+ List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", basDevpPosition.getDevNo()).eq("wrk_sts", 1L).orderBy("modi_time",true));
+ for (WrkMast wrkMast:wrkMastList){
+ if (!Cools.isEmpty(wrkMast)){
+ if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN,wrkMast.getSourceStaNo(),wrkMast.getStaNo())){
+ wrkMastlistA.add(wrkMast);
+ } else {
+ wrkMastlistB.add(wrkMast);
+ }
}
}
}
--
Gitblit v1.9.1