批量取消，执行任务完善

wangyanxiong
1 parent 621875c5
Showing 4 changed files with 153 additions and 31 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -269,8 +269,8 @@ public class ReceiptContainerHeader implements Serializable {
      *
      * @return id - ID
      */
-    public Integer getId() {
-        return id;
+    public  Integer getId() {
+        return this.id;
     }
  
     /**
@@ -119,5 +119,21 @@ public class TaskHeaderController extends BaseController {
     }
  
  
+    /**
+     * 删除立库任务
+     */
+    @RequiresPermissions("task:taskHeader:remove")
+    @Log(title = "任务-任务管理", operating = "删除立库任务", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("taskId不能为空");
+        AjaxResult ajaxResult = taskHeaderService.cancelTask(Convert.toIntArray(ids));
+        return ajaxResult;
+    }
+
+
  
 }
@@ -35,5 +35,7 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
  
     Integer UncompleteCount(String containerCode);
  
+    AjaxResult cancelTask(Integer[] taskIds) ;
+
  
 }
@@ -12,6 +12,7 @@ import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
@@ -88,7 +89,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     private ShipmentDetailService shipmentDetailService;
  
  
-
     @Resource
     private ReceiptContainerHeaderService receiptContainerHeaderService;
     @Resource
@@ -96,9 +96,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
  
  
-
-
-
     /**
      * 查询容器有无任务
      */
@@ -107,6 +104,64 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         return taskHeaderMapper.UncompleteCount(ContainerCode, ShiroUtils.getWarehouseCode());
     }
  
+
+    /**
+     * 取消任务
+     * */
+
+    @Override
+    public AjaxResult cancelTask(Integer[] taskIds) {
+        for(int taskId : taskIds){
+            TaskHeader taskHeader = taskHeaderService.getById(taskId);
+            if(taskHeader==null){
+                return AjaxResult.error("任务"+taskId+"未找到，操作中止");
+            }
+            if(taskHeader.getStatus() > 9){
+                return AjaxResult.error("存在任务"+taskHeader.getId()+"已下发或执行，操作中止");
+            }
+            //删除子任务
+            LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(TaskDetail::getTaskId,taskHeader.getId());
+            taskDetailService.remove(lambdaQueryWrapper);
+            //删除主任务
+            taskHeaderService.removeById(taskHeader.getId());
+            // 更改库位状态（整盘入库任务除外）
+            if(taskHeader.getInternalTaskType() == 100 )
+            {
+                ReceiptContainerHeader record =new ReceiptContainerHeader();
+                record.setStatus((short)0);
+                record.setId(taskHeader.getAllocationHeadId());
+                receiptContainerHeaderService.updateById(record);
+            }
+            //根据任务类型来更新货箱状态
+            //修改关联的货箱状态
+            if(taskHeader.getInternalTaskType() == 200)  {
+                ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
+                shipmentContainerHeader.setId(taskHeader.getAllocationHeadId());
+                shipmentContainerHeader.setStatus(0);
+                shipmentContainerHeaderService.updateById(shipmentContainerHeader);
+            }
+//            if(taskHeader.getInternalTaskType() == 700)   {
+//                CycleCountHeader cycleCountHeader = new CycleCountHeader();
+//                cycleCountHeader.setId(task.getAllocationHeadId());
+//                cycleCountHeader.setLastUpdated(new Date());
+//                cycleCountHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+//                cyclecountDetailService.updateByModel(cyclecountDetail);
+//            }
+            if(taskHeader.getInternalTaskType()==100||taskHeader.getInternalTaskType()==200){
+                if(taskHeader.getToLocation()!=null){
+                    //更新托盘、库位状态
+                    locationService.updateStatus(taskHeader.getToLocation(), "empty");
+                }
+            }
+//            if(task.getType()==900){
+//                //出库查看任务没有关联的货箱，不做处理
+//            }
+        }
+
+        return AjaxResult.success("取消任务成功！");
+    }
+
     /**
      * 生成出库任务
      *
@@ -215,7 +270,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         ShipmentContainerHeader record = new ShipmentContainerHeader();
         record.setId(shipmentContainerHeaderId);
         record.setStatus(10);
-        record.setStatus(task.getTaskType());//实际出库类型
         shipmentContainerHeaderService.saveOrUpdate(record);
         return AjaxResult.success(task.getId());
  
@@ -238,39 +292,64 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
             }
             //修改任务头表
+            task.setId(taskId);
             task.setStatus(10);
             task.setStartPickDateTime(new Date());   //生成时间
             task.setLastUpdated(new Date());
             task.setLastUpdatedBy(ShiroUtils.getLoginName());
-            LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper = Wrappers.lambdaUpdate();
-            HeaderUpdateWrapper.eq(TaskHeader::getId, taskId);
-            if (!taskHeaderService.update(task, HeaderUpdateWrapper))
-                throw new ServiceException("更新任务头失败");
+            taskHeaderService.saveOrUpdate(task);
             //修改任务明细状态
             TaskDetail record = new TaskDetail();
             record.setStatus(10);
             record.setLastUpdated(new Date());
             record.setLastUpdatedBy(ShiroUtils.getLoginName());
+            record.setProcessStamp("100");
+            taskDetailService.updateById(record);
             LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
             lambdaUpdateWrapper.eq(TaskDetail::getTaskId, task.getId());
             if (!taskDetailService.update(record, lambdaUpdateWrapper)){
                 throw new ServiceException("更新任务明细失败");
             }
-            //修改入库明细
-            ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
-            if (!receiptDetailService.updateById(receiptDetail)){
-                throw new ServiceException("更新状态失败");
-            }
-            receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
-            //修改组盘表状态为20
-            ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
-            receiptContainerDetail.setStatus(20);
-            receiptContainerDetail.setLastUpdated(new Date());
-            receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
-            LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-            receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
-            if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
-                throw new ServiceException("更新组盘状态失败");
+//            //修改入库明细
+//            if (task.getInternalTaskType()==100){
+//                ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
+//                if (!receiptDetailService.updateById(receiptDetail)){
+//                    throw new ServiceException("更新状态失败");
+//                }
+//                receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+//
+//                //修改组盘表状态为20
+//                ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
+//                receiptContainerDetail.setStatus(20);
+//                receiptContainerDetail.setLastUpdated(new Date());
+//                receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+//                LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+//                receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
+//                if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
+//                    throw new ServiceException("更新组盘状态失败");
+//            }
+//
+//            //修改出库单状态
+//            if (task.getInternalTaskType()==200){
+//                LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+//                taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
+//               List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
+//
+//                for (TaskDetail taskDeatails: taskDetailList) {
+//                    LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+//                    shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
+//
+//                    ShipmentHeader shipmentHeader =new ShipmentHeader();
+//                    shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
+//                    shipmentHeader.setFirstStatus(100);
+//                    shipmentHeader.setLastStatus(100);
+//                    shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+//                    shipmentHeader.setLastUpdated(new Date());
+//                    shipmentHeaderService.updateById(shipmentHeader);
+//                }
+//            }
+
+
         }
         return AjaxResult.success("下发任务成功", task);
     }
@@ -491,12 +570,37 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId")));
                 if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
                     throw new ServiceException("更新组盘状态失败");
-                //修改入库明细
-                ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
-                if (!receiptDetailService.updateById(receiptDetail)){
-                    throw new ServiceException("更新状态失败");
+
+                if (task.getInternalTaskType()==100){
+                    //修改入库明细
+                    ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
+                    if (!receiptDetailService.updateById(receiptDetail)){
+                        throw new ServiceException("更新状态失败");
+                    }
+                    receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+                }
+
+                //修改出库单明细
+                if (task.getInternalTaskType()==200){
+                    LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+                    taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
+                    List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
+
+                for (TaskDetail taskDeatails: taskDetailList) {
+                    LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+                    shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
+
+                    ShipmentHeader shipmentHeader =new ShipmentHeader();
+                    shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
+                    shipmentHeader.setFirstStatus(100);
+                    shipmentHeader.setLastStatus(100);
+                    shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+                    shipmentHeader.setLastUpdated(new Date());
+                    shipmentHeaderService.updateById(shipmentHeader);
+                }
                 }
-                receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+
+
             }
  
         }