wms / wms_wuhangelinmei · Commits

Commit 5264c77f26772f71ffe5f194024ecedfc69b1b3c

Authored by DESKTOP-AO0VKC8\mahua
1 parent e5532b7b

删除入库完成后合并库存明细

Inline Side-by-side
Showing 1 changed file with 4 additions and 7 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @5264c77
... ... @@ -13,7 +13,6 @@ import com.huaheng.common.utils.DataUtils;
13 13 import com.huaheng.common.utils.StringUtils;
14 14 import com.huaheng.common.utils.security.ShiroUtils;
15 15 import com.huaheng.framework.web.domain.AjaxResult;
16   -import com.huaheng.mobile.download.Constant;
17 16 import com.huaheng.pc.config.configWarning.service.ConfigWarningService;
18 17 import com.huaheng.pc.config.container.domain.Container;
19 18 import com.huaheng.pc.config.container.service.ContainerService;
... ... @@ -21,8 +20,6 @@ import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
21 20 import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
22 21 import com.huaheng.pc.config.location.domain.Location;
23 22 import com.huaheng.pc.config.location.service.LocationService;
24   -import com.huaheng.pc.config.sendMail.service.MailService;
25   -import com.huaheng.pc.config.sendMail.service.SendMailService;
26 23 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
27 24 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
28 25 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
... ... @@ -32,7 +29,6 @@ import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
32 29 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
33 30 import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
34 31 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
35   -import com.huaheng.pc.monitor.message.service.BrokerMessageLogService;
36 32 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
37 33 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
38 34 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
... ... @@ -56,7 +52,6 @@ import com.huaheng.pc.task.taskHeader.domain.MobileTask;
56 52 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
57 53 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
58 54 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
59   -import io.swagger.models.auth.In;
60 55 import org.springframework.beans.factory.annotation.Autowired;
61 56 import org.springframework.stereotype.Service;
62 57 import org.springframework.transaction.annotation.Transactional;
... ... @@ -117,6 +112,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
117 112  
118 113 @Resource
119 114 private CreateTaskMessage createTaskMessage;
  115 + @Resource
  116 + private ReceiptTaskService receiptTaskService;
120 117  
121 118 /**
122 119 * 盘点任务首选项
... ... @@ -676,8 +673,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
676 673 //区分任务类型
677 674 if (task.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF) ) {
678 675 //入库任务
679   - this.completeReceiptTask(task);
680   - combineInventory(task);
  676 + receiptTaskService.completeReceiptTask(task);
  677 +// combineInventory(task);
681 678 }
682 679 if (task.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_PICKING) &&
683 680 (task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT) || task.getTaskType().equals(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT))) {
... ...