wms / wms_ningboyongqiang · Commits

Commit 9df4d60e77ea88e7ab1d4cbbd2c402eab26ca6e2

Authored by wangyanxiong
1 parent e8e59ce9

批量取消，执行任务完善

Inline Side-by-side
Showing 2 changed files with 55 additions and 59 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @9df4d60
... ... @@ -411,7 +411,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
411 411  
412 412  
413 413 /**
414   - *完成任务
  414 + *完成入库任务
415 415 */
416 416 @Override
417 417 @Transactional
... ... @@ -510,30 +510,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
510 510 if ( !taskDetailService.update(taskDetail, lambdaUpdateWrapper)){
511 511 throw new ServiceException("修改入库单明细失败");
512 512 }
513   -// //修改入库单的状态
514   -// ReceiptHeader receiptHeader = new ReceiptHeader();
515   -// receiptHeader.setFirstStatus(100);
516   -// receiptHeader.setLastStatus(100);
517   -// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
518   -// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
519   -// if (!receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper)){
520   -// throw new ServiceException("修改入库单失败");
521   -// }
522   -// //修改任务明细的状态为完成
523   -// TaskDetail taskDetail = new TaskDetail();
524   -// taskDetail.setStatus(100);
525   -// taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
526   -// taskDetail.setAgingDate(new Date()); //入库时间
527   -// LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
528   -// lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
529   -// taskDetailService.update(taskDetail, lambdaUpdateWrapper);
530   -// //修改入库单的状态
531   -// ReceiptHeader receiptHeader =new ReceiptHeader();
532   -// receiptHeader.setFirstStatus(100);
533   -// receiptHeader.setLastStatus(100);
534   -// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
535   -// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
536   -// receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
537 513  
538 514 //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成
539 515 task.setStatus(100);
... ... @@ -581,24 +557,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
581 557 }
582 558  
583 559 //修改出库单明细
584   - if (task.getInternalTaskType()==200){
585   - LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
586   - taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
587   - List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
588   -
589   - for (TaskDetail taskDeatails: taskDetailList) {
590   - LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
591   - shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
592   -
593   - ShipmentHeader shipmentHeader =new ShipmentHeader();
594   - shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
595   - shipmentHeader.setFirstStatus(100);
596   - shipmentHeader.setLastStatus(100);
597   - shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
598   - shipmentHeader.setLastUpdated(new Date());
599   - shipmentHeaderService.updateById(shipmentHeader);
600   - }
601   - }
  560 +// if (task.getInternalTaskType()==200){
  561 +//// LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  562 +//// taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  563 +//// List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  564 +//
  565 +//// for (TaskDetail taskDeatails: taskDetailList) {
  566 +//// LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  567 +//// shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  568 +////
  569 +//// ShipmentHeader shipmentHeader =new ShipmentHeader();
  570 +//// shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  571 +//// shipmentHeader.setFirstStatus(100);
  572 +//// shipmentHeader.setLastStatus(100);
  573 +//// shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  574 +//// shipmentHeader.setLastUpdated(new Date());
  575 +//// shipmentHeaderService.updateById(shipmentHeader);
  576 +//// }
  577 +// }
602 578  
603 579  
604 580 }
... ... @@ -1137,7 +1113,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1137 1113 //设置子任务状态为已执行
1138 1114 taskDetail.setStatus(100);
1139 1115 taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
1140   - taskDetail.setLastUpdated(new Date()); //完成时间
  1116 + taskDetail.setLastUpdated(new Date());//完成时间
1141 1117 taskDetailService.updateById(taskDetail);
1142 1118 //记录库存交易记录
1143 1119 InventoryTransaction inventoryTransaction = new InventoryTransaction();
... ... @@ -1202,24 +1178,44 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1202 1178 }
1203 1179 }
1204 1180 //设置出库货箱状态为拣货任务完成
1205   - ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
1206   - receiptContainerDetail.setStatus(30);
1207   - receiptContainerDetail.setLastUpdated(new Date());
1208   - receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
1209   - LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
1210   - receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getId,task.getAllocationHeadId());
1211   - if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper)){
  1181 + ShipmentContainerDetail shipmentContainerDetail = new ShipmentContainerDetail();
  1182 + shipmentContainerDetail.setStatus(30);
  1183 + shipmentContainerDetail.setLastUpdated(new Date());
  1184 + shipmentContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  1185 + LambdaUpdateWrapper<ShipmentContainerDetail> shipmentContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1186 + shipmentContainerDetailLambdaUpdateWrapper.eq(ShipmentContainerDetail::getId,task.getAllocationHeadId());
  1187 + if (! shipmentContainerDetailService.update(shipmentContainerDetail, shipmentContainerDetailLambdaUpdateWrapper)){
1212 1188 throw new ServiceException("更新组盘明细状态失败");
1213 1189 }
1214 1190 //设置出库货箱表头状态为拣货任务完成
1215   - ReceiptContainerHeader ContainerHeader = new ReceiptContainerHeader();
1216   - ContainerHeader.setStatus((short)30);
1217   - ContainerHeader.setLastUpdated(new Date());
1218   - ContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
1219   - LambdaUpdateWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
1220   - receiptContainerHeaderLambdaUpdateWrapper.eq(ReceiptContainerHeader::getId,task.getAllocationHeadId());
1221   - if (! receiptContainerHeaderService.update(ContainerHeader, receiptContainerHeaderLambdaUpdateWrapper))
  1191 + ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
  1192 + shipmentContainerHeader.setStatus(30);
  1193 + shipmentContainerHeader.setLastUpdated(new Date());
  1194 + shipmentContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1195 + LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1196 + shipmentContainerHeaderLambdaUpdateWrapper.eq(ShipmentContainerHeader::getId,task.getAllocationHeadId());
  1197 + if (! shipmentContainerHeaderService.update(shipmentContainerHeader, shipmentContainerHeaderLambdaUpdateWrapper))
1222 1198 throw new ServiceException("更新组盘头状态失败");
  1199 +
  1200 +
  1201 + //修改出库单状态
  1202 + LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1203 + taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  1204 + List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  1205 +
  1206 + for (TaskDetail taskDeatails: taskDetailList) {
  1207 + LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1208 + shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  1209 +
  1210 + ShipmentHeader shipmentHeader =new ShipmentHeader();
  1211 + shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  1212 + shipmentHeader.setFirstStatus(100);
  1213 + shipmentHeader.setLastStatus(100);
  1214 + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1215 + shipmentHeader.setLastUpdated(new Date());
  1216 + shipmentHeaderService.updateById(shipmentHeader);
  1217 + }
  1218 +
1223 1219 }
1224 1220  
1225 1221  
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @9df4d60
... ... @@ -473,7 +473,7 @@
473 473 return;
474 474 }
475 475 $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
476   - var url = ctx + 'task/task/remove';
  476 + var url = ctx + 'task/taskHeader/remove';
477 477 var ids = "";
478 478 for(var i=0; i<rows.length; i++) {
479 479 ids = ids + rows[i].id + ","
... ...