From 3bcfebe3912bdaf8abf2d29b6913b771bad3804c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 129 +++++++++++++++++++++++++++++++++++-------
1 files changed, 106 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 804312e..fcbb237 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,15 +1,10 @@
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.NccCgCgdhdWms;
-import com.zy.nc.entity.NccCkPddWms;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.entity.NccScZkmxbWms;
-import com.zy.nc.service.NccCgCgdhdWmsService;
-import com.zy.nc.service.NccCkPddWmsService;
-import com.zy.nc.service.NccSaleXsfhmxWmsService;
-import com.zy.nc.service.NccScZkmxbWmsService;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.*;
import com.zy.nc.task.handler.PlanOrderHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +31,13 @@
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
@Autowired
+ private NccSaleDbddWmsService nccSaleDbddWmsService;
+
+ @Autowired
private NccCkPddWmsService nccCkPddWmsService;
+
+ @Autowired
+ private StoreTypeService storeTypeService;
/**
* 鍙戣揣
@@ -45,19 +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));
+ 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()) {
+ 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);
+// }
+ }
}
/**
@@ -66,20 +84,52 @@
* @return
*/
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute2() {
- List<String> strings = nccScZkmxbWmsService.selectZk();
+ public void execute2_1() {
+ List<String> ids = storeTypeService.listOwn();
+ //String s = "涓�鏈熸垚鍝佸簱-鍐呰锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚幈鍥介檯澶栬锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-澶栬喘(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚揪/宸ュ巶澶栬锤(绔嬩綋搴�)銆佷竴鏈熻緟鏂欏簱-鍖呮潗(绔嬩綋搴�)";
+ List<String> strings = nccScZkmxbWmsService.selectZkIn(ids);
for (String string : strings) {
- List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
- ReturnT<String> returnT = planOrderHandler.start2(wmsFlag);
+ 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()) {
+ 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());
}
}
+ }
+ /**
+ * 杞簱-鍑哄簱
+ * 涓嶅悓姝ワ紝杞簱鍑哄簱鐢盬MS鐩存帴鍙戣捣
+ *
+ * @return
+ */
+// @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()) {
+ 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());
+ }
+ }
}
/**
@@ -91,11 +141,15 @@
public void execute3() {
List<String> strings = nccCgCgdhdWmsService.selectCg();
for (String string : strings) {
- List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ 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()) {
+ 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());
@@ -105,23 +159,52 @@
}
/**
- * 鐩樼偣鍗�
+ * 璋冩嫧鍑哄簱
*
* @return
*/
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute4() {
- List<String> strings = nccCkPddWmsService.selectPdd();
+ public void execute5() {
+ List<String> ids = storeTypeService.listOwn();
+ List<String> strings = nccSaleDbddWmsService.selectDbdd(ids);
for (String string : strings) {
- List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1));
- ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
+ 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()) {
+ continue;
+ }
+ ReturnT<String> returnT = planOrderHandler.start5(wmsFlag);
if (!returnT.isSuccess()) {
- for (NccCkPddWms wms : wmsFlag) {
+ for (NccSaleDbddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
- nccCkPddWmsService.updateById(wms);
+ wms.setWmsFlag(0);
+ nccSaleDbddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
}
}
+
}
+
+
+ /**
+ * 鐩樼偣鍗�
+ *
+ * @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());
+// wms.setWmsFlag(0);
+// nccCkPddWmsService.updateById(wms);
+// }
+// log.error(returnT.getMsg());
+// }
+// }
+// }
}
--
Gitblit v1.9.1