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 index 46ecb73..9a9c825 100644 --- 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 @@ -12,6 +12,8 @@ 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.*; @@ -43,6 +45,8 @@ public class AutoDeleteReceiptTask implements Job { private IHuahengMultiHandlerService huahengMultiHandlerService; @Resource private IParameterConfigurationService parameterConfigurationService; + @Resource + private ITaskHeaderService taskHeaderService; @Override public void execute(JobExecutionContext context) throws JobExecutionException { @@ -68,6 +72,12 @@ public class AutoDeleteReceiptTask implements Job { 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/task/taskHeader/service/ITaskHeaderService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java index 80b32ec..3dd2724 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java @@ -452,4 +452,6 @@ public interface ITaskHeaderService extends IService<TaskHeader> { */ List<String> findCommonData(List<String> dataList1, List<String> dataList2, boolean flag); + boolean delMain (Integer id); + } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java index a86bdd0..114dc59 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java @@ -2538,6 +2538,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea return commonData; } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delMain(Integer id) { + TaskHeader taskHeader = getById(id); + taskHeaderHistoryService.saveById(id); + taskDetailMapper.deleteByMainId(String.valueOf(id)); + taskHeaderMapper.deleteById(id); + LogRecordContext.putVariable("taskHeader", taskHeader); + return true; + } + /** * 完成空托盘入库任务 * @param taskHeader 任务