From 9afe7ca53c38f2aa1010c2ac2a778012d133160f Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 03 六月 2025 16:42:03 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/nc/task/PlanOrderTask.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java index c7d116d..c77db99 100644 --- a/src/main/java/com/zy/nc/task/PlanOrderTask.java +++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java @@ -6,13 +6,11 @@ import com.zy.nc.entity.*; import com.zy.nc.service.*; import com.zy.nc.task.handler.PlanOrderHandler; -import com.zy.system.service.impl.ConfigServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.Arrays; import java.util.List; @Slf4j @@ -48,13 +46,19 @@ */ @Scheduled(cron = "0/3 * * * * ? ") public void execute1() { - List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(); + List<String> ids = storeTypeService.listOwn(); + List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(ids); 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).eq("fstatusflag", 2)); + List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0)); if (wmsFlag == null || wmsFlag.isEmpty()) { return; } - ReturnT<String> returnT = planOrderHandler.start1(wmsFlag); + ReturnT<String> returnT; + if (wmsFlag.get(0).getNastnum().doubleValue() > 0) { + returnT = planOrderHandler.start1(wmsFlag); + } else { + returnT = planOrderHandler.start1In(wmsFlag); + } if (!returnT.isSuccess()) { for (NccSaleXsfhmxWms wms : wmsFlag) { wms.setWmsMemo(returnT.getMsg()); @@ -102,7 +106,7 @@ List<String> ids = storeTypeService.listOwn(); List<String> strings = nccScZkmxbWmsService.selectZkOut(ids); for (String string : strings) { - List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0)); + 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; } @@ -178,7 +182,7 @@ public void execute4() { List<String> strings = nccCkPddWmsService.selectPdd(); for (String string : strings) { - List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG",4).eq("hdr", 0).eq("bdr", 0)); + List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG", 4).eq("hdr", 0).eq("bdr", 0)); ReturnT<String> returnT = planOrderHandler.start4(wmsFlag); if (!returnT.isSuccess()) { for (NccCkPddWms wms : wmsFlag) { -- Gitblit v1.9.1