From c11645d9d082306e7ac2c7d7b23cfcc3e9a9c1c2 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期一, 11 五月 2026 18:57:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 0bd578b..6f4008b 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -70,6 +70,7 @@
if (Cools.isEmpty(list)) {
return;
}
+ list.sort(Comparator.comparing(OrderPakout::getCreateTime, Comparator.nullsLast(Date::compareTo)));
for (OrderPakout order : list) {
if (order.getDocType() != null) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -86,8 +87,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch(),
- detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1(), detl.getBoxType2(), detl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch() != ""?detl.getBatch():"R002",
+ detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1() !=""?detl.getBoxType1():"R002", detl.getBoxType2(), detl.getBoxType3());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()).eq("loc_sts", "F"));
if (locMast != null) {
--
Gitblit v1.9.1