From a5de20d0041431b7f5e92a49315082ff2140d447 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 10:48:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 77 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 54ed163..3d7868f 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,17 +1,16 @@
package com.zy.nc.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.asrs.task.core.ReturnT;
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
@@ -36,8 +35,9 @@
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
+
@Autowired
- private ConfigServiceImpl configService;
+ private StoreTypeService storeTypeService;
/**
* 鍙戣揣
@@ -46,22 +46,36 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute1() {
- List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
+ 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).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)
+ .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());
}
- }
+// if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
+// returnT = planOrderHandler.start1(wmsFlag);
+// } else {
+// returnT = planOrderHandler.start1In(wmsFlag);
+// }
+ }
}
/**
@@ -71,8 +85,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute2_1() {
- //Config wmsFlag1 = configService.selectConfigByCode("wms_flag");
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ List<String> ids = storeTypeService.listOwn();
//String s = "涓�鏈熸垚鍝佸簱-鍐呰锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚幈鍥介檯澶栬锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-澶栬喘(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚揪/宸ュ巶澶栬锤(绔嬩綋搴�)銆佷竴鏈熻緟鏂欏簱-鍖呮潗(绔嬩綋搴�)";
List<String> strings = nccScZkmxbWmsService.selectZkIn(ids);
for (String string : strings) {
@@ -84,6 +97,7 @@
if (!returnT.isSuccess()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -92,16 +106,17 @@
}
/**
- * 杞簱
+ * 杞簱-鍑哄簱
+ * 涓嶅悓姝ワ紝杞簱鍑哄簱鐢盬MS鐩存帴鍙戣捣
*
* @return
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
public void execute2_2() {
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ 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;
}
@@ -109,6 +124,7 @@
if (!returnT.isSuccess()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -133,6 +149,7 @@
if (!returnT.isSuccess()) {
for (NccCgCgdhdWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccCgCgdhdWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -148,7 +165,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute5() {
- List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+ List<String> ids = storeTypeService.listOwn();
List<String> strings = nccSaleDbddWmsService.selectDbdd(ids);
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));
@@ -159,6 +176,7 @@
if (!returnT.isSuccess()) {
for (NccSaleDbddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleDbddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -173,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("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