From d72d46b4cf88d38d5dd3acd02b80a819e8b4a073 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 15 七月 2025 13:42:12 +0800 Subject: [PATCH] # --- src/main/java/com/zy/nc/task/PlanOrderTask.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 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..fcbb237 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()) { @@ -84,7 +91,7 @@ for (String string : strings) { List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0)); if (wmsFlag == null || wmsFlag.isEmpty()) { - return; + continue; } ReturnT<String> returnT = planOrderHandler.start2In(wmsFlag); if (!returnT.isSuccess()) { @@ -111,7 +118,7 @@ for (String string : strings) { List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0)); if (wmsFlag == null || wmsFlag.isEmpty()) { - return; + continue; } ReturnT<String> returnT = planOrderHandler.start2Out(wmsFlag); if (!returnT.isSuccess()) { @@ -136,7 +143,7 @@ for (String string : strings) { List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0)); if (wmsFlag == null || wmsFlag.isEmpty()) { - return; + continue; } ReturnT<String> returnT = planOrderHandler.start3(wmsFlag); if (!returnT.isSuccess()) { @@ -163,7 +170,7 @@ for (String string : strings) { List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0)); if (wmsFlag == null || wmsFlag.isEmpty()) { - return; + continue; } ReturnT<String> returnT = planOrderHandler.start5(wmsFlag); if (!returnT.isSuccess()) { -- Gitblit v1.9.1