From 6a7617cdc6b06ab061417b8cc8b6a4fd13a47a7b Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期二, 22 七月 2025 16:07:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 7ebebd2..fcbb237 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,17 +46,25 @@
*/
@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()) {
for (NccSaleXsfhmxWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleXsfhmxWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -83,12 +91,13 @@
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()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -97,23 +106,25 @@
}
/**
- * 杞簱
+ * 杞簱-鍑哄簱
+ * 涓嶅悓姝ワ紝杞簱鍑哄簱鐢盬MS鐩存帴鍙戣捣
*
* @return
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
public void execute2_2() {
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("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start2Out(wmsFlag);
if (!returnT.isSuccess()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -132,12 +143,13 @@
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()) {
for (NccCgCgdhdWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccCgCgdhdWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -158,12 +170,13 @@
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()) {
for (NccSaleDbddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleDbddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -178,19 +191,20 @@
*
* @return
*/
- @Scheduled(cron = "0/3 * * * * ? ")
- 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));
- ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
- if (!returnT.isSuccess()) {
- for (NccCkPddWms wms : wmsFlag) {
- wms.setWmsMemo(returnT.getMsg());
- nccCkPddWmsService.updateById(wms);
- }
- log.error(returnT.getMsg());
- }
- }
- }
+// @Scheduled(cron = "0/3 * * * * ? ")
+// 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));
+// ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
+// if (!returnT.isSuccess()) {
+// for (NccCkPddWms wms : wmsFlag) {
+// wms.setWmsMemo(returnT.getMsg());
+// wms.setWmsFlag(0);
+// nccCkPddWmsService.updateById(wms);
+// }
+// log.error(returnT.getMsg());
+// }
+// }
+// }
}
--
Gitblit v1.9.1