wms / wms4_jiangxijisheng · Commits

Commit 9376c8063e8a1c4b3b3bb767e47e07d359dff8e5

Authored by 曾湘平
1 parent c678f708

定时任务增加任务完成后转移到历史记录

Inline Side-by-side
Showing 3 changed files with 24 additions and 1 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteReceiptTask.java
  View file @9376c80
... ... @@ -12,6 +12,8 @@ import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
12 12 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
13 13 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
14 14 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
  15 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
  16 +import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
15 17 import org.jeecg.utils.StringUtils;
16 18 import org.jeecg.utils.constant.QuantityConstant;
17 19 import org.quartz.*;
... ... @@ -43,6 +45,8 @@ public class AutoDeleteReceiptTask implements Job {
43 45 private IHuahengMultiHandlerService huahengMultiHandlerService;
44 46 @Resource
45 47 private IParameterConfigurationService parameterConfigurationService;
  48 + @Resource
  49 + private ITaskHeaderService taskHeaderService;
46 50  
47 51 @Override
48 52 public void execute(JobExecutionContext context) throws JobExecutionException {
... ... @@ -68,6 +72,12 @@ public class AutoDeleteReceiptTask implements Job {
68 72 for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
69 73 shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
70 74 }
71   -
  75 + LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
  76 + taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
  77 + List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
  78 + log.info(String.format(" AutoDeleteReceiptTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
  79 + for (TaskHeader taskHeader : taskHeaderList) {
  80 + taskHeaderService.delMain(taskHeader.getId());
  81 + }
72 82 }
73 83 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
  View file @9376c80
... ... @@ -452,4 +452,6 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
452 452 */
453 453 List<String> findCommonData(List<String> dataList1, List<String> dataList2, boolean flag);
454 454  
  455 + boolean delMain (Integer id);
  456 +
455 457 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @9376c80
... ... @@ -2538,6 +2538,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2538 2538 return commonData;
2539 2539 }
2540 2540  
  2541 + @Override
  2542 + @Transactional(rollbackFor = Exception.class)
  2543 + public boolean delMain(Integer id) {
  2544 + TaskHeader taskHeader = getById(id);
  2545 + taskHeaderHistoryService.saveById(id);
  2546 + taskDetailMapper.deleteByMainId(String.valueOf(id));
  2547 + taskHeaderMapper.deleteById(id);
  2548 + LogRecordContext.putVariable("taskHeader", taskHeader);
  2549 + return true;
  2550 + }
  2551 +
2541 2552 /**
2542 2553 * 完成空托盘入库任务
2543 2554 * @param taskHeader 任务
... ...