From c45f2e980ff53c2e0d8a0a05480d347132a6cd3c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 八月 2025 16:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 113 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 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 7c29060..fcbb237 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,6 +1,7 @@
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.*;
@@ -35,6 +36,9 @@
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
+ @Autowired
+ private StoreTypeService storeTypeService;
+
/**
* 鍙戣揣
*
@@ -42,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);
+// }
+ }
}
/**
@@ -63,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());
+ }
+ }
}
/**
@@ -88,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());
@@ -108,13 +165,18 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute5() {
- List<String> strings = nccSaleDbddWmsService.selectDbdd();
+ 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));
+ 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 (NccSaleDbddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleDbddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -129,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