From ca2a6d455604056ce628f296911f6abac85a7598 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 09:54:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 43cace7..3d7868f 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,12 +46,19 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute1() {
- List<String> ids = storeTypeService.listOwn();
- List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(ids);
+ List<String> warehouseIds = storeTypeService.listOwn();
+ List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(warehouseIds);
for (String id : Ids) {
- List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0));
+ List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>()
+ .eq("vbillcode", id)
+ .ne("wms_flag", 1)
+ .eq("fstatusflag", 2)
+ .eq("hdr", 0)
+ .eq("bdr", 0)
+ .in("fhckbm",warehouseIds)
+ );
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start1(wmsFlag);
if (!returnT.isSuccess()) {
--
Gitblit v1.9.1