wms / wms_guangzhouwanbao · Commits

Commit f08deca1f9ea5edff665a0bb0f9d4696563af4f0

Authored by mahuandong
1 parent 6bd8f75e

修改任务完成更新库位的错误

Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @f08deca
... ... @@ -528,18 +528,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
528 528 Location location = new Location();
529 529 location.setContainerCode(task.getContainerCode());
530 530 location.setStatus("empty");
531   - LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate(location);
  531 + LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
532 532 locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
533   - if (!locationService.update(locationLambdaUpdateWrapper))
  533 + if (!locationService.update(location,locationLambdaUpdateWrapper))
534 534 throw new ServiceException("更新库位失败");
535 535  
536 536 //修改容器状态和对应的库位
537 537 Container container = new Container();
538 538 container.setLocationCode(task.getToLocation());
539 539 container.setStatus("some");
540   - LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate(container);
  540 + LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
541 541 containerLambdaUpdateWrapper.eq(Container::getCode, task.getContainerCode());
542   - if (!containerService.update(containerLambdaUpdateWrapper)){
  542 + if (!containerService.update(container, containerLambdaUpdateWrapper)){
543 543 throw new ServiceException("更新容器失败");
544 544 }
545 545 //修改组盘表状态为20
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @f08deca
... ... @@ -59,7 +59,7 @@
59 59 </a>
60 60 <a class="btn btn-outline btn-default btn-rounded" onclick="$.operate.add()"
61 61 shiro:hasPermission="receipt:receiptHeader:add">
62   - <i class="fa fa-plus"></i> 提交审核
  62 + <i class="fa fa-space-shuttle"></i> 提交审核
63 63 </a>
64 64 <a class="btn btn-outline btn-primary btn-rounded" onclick="$.operate.add()"
65 65 shiro:hasPermission="receipt:receiptDetail:approval">
... ... @@ -67,7 +67,7 @@
67 67 </a>
68 68 <a class="btn btn-outline btn-warning btn-rounded" onclick="$.operate.add()"
69 69 shiro:hasPermission="receipt:receiptDetail:approval">
70   - <i class="fa fa-plus"></i> 驳回
  70 + <i class="fa fa-reply"></i> 驳回
71 71 </a>
72 72 <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.add()"
73 73 shiro:hasPermission="receipt:receiptDetail:approval">
... ... @@ -161,7 +161,8 @@
161 161 },
162 162 {
163 163 field : 'scheduledArriveDate',
164   - title : '预计到达日期'
  164 + title : '预计到达日期',
  165 + sortable:true
165 166 },
166 167 {
167 168 field : 'actualArriveDate',
... ...