Commit 67d9b2ab54d84603a9da1a4f23c344c795b7c6a0
1 parent
1beb11fa
VUE入库单页面主键ID类型转换使用.toString()修复，空出，重入，取货错任务操作记录添加
Signed-off-by: TanYibin <5491541@qq.com>
Showing
3 changed files
with
14 additions
and
3 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
| ... | ... | @@ -372,7 +372,7 @@ export default { |
| 372 | 372 | return { |
| 373 | 373 | on: { |
| 374 | 374 | click: () => { |
| 375 | - this.onSelectChange(record.id.split(","), [record]); | |
| 375 | + this.onSelectChange(record.id.toString().split(','), [record]); | |
| 376 | 376 | } |
| 377 | 377 | } |
| 378 | 378 | } |
| ... | ... | @@ -383,7 +383,7 @@ export default { |
| 383 | 383 | this.selectedMainId = '' |
| 384 | 384 | }, |
| 385 | 385 | onSelectChange(selectedRowKeys, selectionRows) { |
| 386 | - this.selectedMainId = selectedRowKeys[0] | |
| 386 | + this.selectedMainId = selectedRowKeys[0].toString(); | |
| 387 | 387 | this.selectedRowKeys = selectedRowKeys; |
| 388 | 388 | this.selectionRows = selectionRows; |
| 389 | 389 | }, |
| ... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
| ... | ... | @@ -466,6 +466,9 @@ public class WcsServiceImpl implements WcsService { |
| 466 | 466 | |
| 467 | 467 | @Override |
| 468 | 468 | @Transactional(rollbackFor = Exception.class) |
| 469 | + @OperationLog(bizId = "#taskHeader.getId()", bizType = "'任务追踪'", tag = "'空出处理'", extra = "''", | |
| 470 | + msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()", | |
| 471 | + recordReturnValue = true) | |
| 469 | 472 | public Result emptyOutHandle(String taskNo) { |
| 470 | 473 | if (StringUtils.isEmpty(taskNo)) { |
| 471 | 474 | return Result.error("任务号为空"); |
| ... | ... | @@ -488,11 +491,15 @@ public class WcsServiceImpl implements WcsService { |
| 488 | 491 | if (!success) { |
| 489 | 492 | return Result.error("修改任务失败，空出处理失败"); |
| 490 | 493 | } |
| 494 | + LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集 | |
| 491 | 495 | return Result.ok("空出处理成功"); |
| 492 | 496 | } |
| 493 | 497 | |
| 494 | 498 | @Override |
| 495 | 499 | @Transactional(rollbackFor = Exception.class) |
| 500 | + @OperationLog(bizId = "#taskHeader.getId()", bizType = "'任务追踪'", tag = "'重入处理'", extra = "''", | |
| 501 | + msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()", | |
| 502 | + recordReturnValue = true) | |
| 496 | 503 | public Result reentryHandle(String taskNo) { |
| 497 | 504 | // 1、判断非空字段 |
| 498 | 505 | if (StringUtils.isEmpty(taskNo)) { |
| ... | ... | @@ -589,11 +596,15 @@ public class WcsServiceImpl implements WcsService { |
| 589 | 596 | TaskReentryEntity taskReentryEntity = new TaskReentryEntity(); |
| 590 | 597 | taskReentryEntity.setTaskNo(Integer.parseInt(taskNo)); |
| 591 | 598 | taskReentryEntity.setRedirectionLocationCode(toLocationCode); |
| 599 | + LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集 | |
| 592 | 600 | return Result.ok(taskReentryEntity); |
| 593 | 601 | } |
| 594 | 602 | |
| 595 | 603 | @Override |
| 596 | 604 | @Transactional(rollbackFor = Exception.class) |
| 605 | + @OperationLog(bizId = "#taskHeader.getId()", bizType = "'任务追踪'", tag = "'取货错处理'", extra = "''", | |
| 606 | + msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()", | |
| 607 | + recordReturnValue = true) | |
| 597 | 608 | public Result pickupErrorHandle(String taskNo) { |
| 598 | 609 | // 1、判断非空字段 |
| 599 | 610 | if (StringUtils.isEmpty(taskNo)) { |
| ... | ... | @@ -616,6 +627,7 @@ public class WcsServiceImpl implements WcsService { |
| 616 | 627 | if (!success) { |
| 617 | 628 | return Result.error("取货错处理失败，更新任务失败"); |
| 618 | 629 | } |
| 630 | + LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集 | |
| 619 | 631 | return Result.ok("取货错处理成功"); |
| 620 | 632 | } |
| 621 | 633 | |
| ... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
