From ce702b224f6239ac750bb7fc81ca68b6ebbeda70 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Tue, 20 Feb 2024 10:41:53 +0800
Subject: [PATCH] update
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java | 83 -----------------------------------------------------------------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 83 deletions(-)
delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java
create mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java
deleted file mode 100644
index 9a9c825..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.jeecg.modules.wms.monitor.job;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.wms.api.erp.service.IErpService;
-import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
-import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
-import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
-import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
-import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
-import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
-import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
-import org.jeecg.utils.StringUtils;
-import org.jeecg.utils.constant.QuantityConstant;
-import org.quartz.*;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 删除完成的单据
- * @author 游杰
- */
-
-@Slf4j
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
-public class AutoDeleteReceiptTask implements Job {
-
- @Resource
- private IReceiptHeaderService receiptHeaderService;
-
- @Resource
- private IShipmentHeaderService shipmentHeaderService;
-
- @Resource
- private IErpService erpService;
- @Resource
- private IHuahengMultiHandlerService huahengMultiHandlerService;
- @Resource
- private IParameterConfigurationService parameterConfigurationService;
- @Resource
- private ITaskHeaderService taskHeaderService;
-
- @Override
- public void execute(JobExecutionContext context) throws JobExecutionException {
- String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_DELETE_RECEIPT);
- if (StringUtils.isEmpty(value)) {
- value = "0";
- }
- int DELETE_RECEIPT = Integer.parseInt(value);
- if (DELETE_RECEIPT == QuantityConstant.NOT_DELETE_RECEIPT) {
- return;
- }
- LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
- receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).isNull(ReceiptHeader::getReferCode);
- List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! receiptHeaderList :" + receiptHeaderList + "时间" + DateUtils.getTimestamp()));
- for (ReceiptHeader receiptHeader : receiptHeaderList) {
- receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
- }
- LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
- shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED).isNull(ShipmentHeader::getReferCode);
- List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! shipmentHeaderList :" + shipmentHeaderList + "时间" + DateUtils.getTimestamp()));
- for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
- shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
- }
- LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
- taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
- List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
- for (TaskHeader taskHeader : taskHeaderList) {
- taskHeaderService.delMain(taskHeader.getId());
- }
- }
-}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
new file mode 100644
index 0000000..91da70f
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.wms.monitor.job;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
+import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
+import org.quartz.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 删除完成的单据
+ * @author 游杰
+ */
+
+@Slf4j
+@PersistJobDataAfterExecution
+@DisallowConcurrentExecution
+public class AutoDeleteTask implements Job {
+
+ @Resource
+ private IReceiptHeaderService receiptHeaderService;
+
+ @Resource
+ private IShipmentHeaderService shipmentHeaderService;
+
+ @Resource
+ private IErpService erpService;
+ @Resource
+ private IHuahengMultiHandlerService huahengMultiHandlerService;
+ @Resource
+ private IParameterConfigurationService parameterConfigurationService;
+ @Resource
+ private ITaskHeaderService taskHeaderService;
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_DELETE_RECEIPT);
+ if (StringUtils.isEmpty(value)) {
+ value = "0";
+ }
+ int DELETE_RECEIPT = Integer.parseInt(value);
+ if (DELETE_RECEIPT == QuantityConstant.NOT_DELETE_RECEIPT) {
+ return;
+ }
+ LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).isNull(ReceiptHeader::getReferCode);
+ List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderLambdaQueryWrapper);
+ log.info(String.format(" AutoDeleteReceiptTask 执行任务! receiptHeaderList :" + receiptHeaderList + "时间" + DateUtils.getTimestamp()));
+ for (ReceiptHeader receiptHeader : receiptHeaderList) {
+ receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
+ }
+ LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED).isNull(ShipmentHeader::getReferCode);
+ List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
+ log.info(String.format(" AutoDeleteReceiptTask 执行任务! shipmentHeaderList :" + shipmentHeaderList + "时间" + DateUtils.getTimestamp()));
+ for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
+ shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
+ }
+ LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+ taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
+ List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+ log.info(String.format(" AutoDeleteReceiptTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
+ for (TaskHeader taskHeader : taskHeaderList) {
+ taskHeaderService.delMain(taskHeader.getId());
+ }
+ }
+}
--
libgit2 0.22.2