From 184717674fc93a93e2494e21f5914425e17862a5 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Tue, 15 Apr 2025 15:12:07 +0800 Subject: [PATCH] no message --- .../business/wms/receive/ReceiveService.java | 11 ++++++----- .../wms/receive/asn/service/AsnService.java | 4 ++-- .../asnDetail/service/AsnDetailService.java | 18 +++++++++++------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java index 86af3d2..9de1e20 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveService.java @@ -191,12 +191,12 @@ public class ReceiveService { //批量操作 batchUpdateOrInsert(updateToAsnDetail, insertToTask, insertToInventory, updateToInventory); - //操作日志 - dataTracerService.addTrace(asn.getAsnId(), DataTracerTypeEnum.ASN, "批量收货：" + joiner.getSussMsg().toString()); - //刷新入库单 asnDetailService.refreshAsn(batchReceiveForm.getAsnId()); + //操作日志 + dataTracerService.addTrace(asn.getAsnId(), DataTracerTypeEnum.ASN, "批量收货：" + joiner.getSussMsg().toString() + joiner.getErrorMsg().toString()); + Long endTime = System.currentTimeMillis(); log.info("批量收货耗时：{}ms", endTime - statrTime); @@ -293,11 +293,12 @@ public class ReceiveService { //批量操作 returnUpdateOrInsert(updateToAsnDetail, deleteToTask, updateToInventory, deleteToInventory); + //刷新入库单 + asnDetailService.refreshAsn(batchReturnForm.getAsnId()); + //操作日志 dataTracerService.addTrace(batchReturnForm.getAsnId(), DataTracerTypeEnum.ASN, "批量退货：" + joiner.getSussMsg().toString()); - //刷新入库单 - asnDetailService.refreshAsn(batchReturnForm.getAsnId()); Long endTime = System.currentTimeMillis(); log.info("批量退货耗时：{}ms", endTime - statrTime); diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java index 931b05c..789b1b9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/AsnService.java @@ -93,7 +93,7 @@ public class AsnService { asnDao.insert(asnEntity); //操作记录 - dataTracerService.addTrace(asnEntity.getAsnId(), DataTracerTypeEnum.ASN,"新建入库单", null,asnEntity); + dataTracerService.addTrace(asnEntity.getAsnId(), DataTracerTypeEnum.ASN,"新建入库单："+asnEntity.getAsnNumber(), null,asnEntity); return ResponseDTO.ok(asnEntity); } @@ -112,7 +112,7 @@ public class AsnService { AsnEntity asnEntity = SmartBeanUtil.copy(updateForm, AsnEntity.class); asnDao.updateById(asnEntity); //业务操作记录 - dataTracerService.addTrace(updateForm.getAsnId(), DataTracerTypeEnum.ASN,"编辑入库单", exitAsn,asnEntity); + dataTracerService.addTrace(updateForm.getAsnId(), DataTracerTypeEnum.ASN,"编辑入库单："+asnEntity.getAsnNumber(), exitAsn,asnEntity); return ResponseDTO.ok(asnEntity); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java index 179764c..d19b0af 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/service/AsnDetailService.java @@ -76,12 +76,13 @@ public class AsnDetailService { AsnDetailEntity asnDetailEntity = SmartBeanUtil.copy(addForm, AsnDetailEntity.class); asnDetailDao.insert(asnDetailEntity); + //刷新出库单 + refreshAsn(addForm.getAsnId()); + //业务操作记录 ItemEntity item = itemDao.selectById(addForm.getItemId()); dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "添加：" + item.getItemCode() + "物料明细", null, asnDetailEntity); - //刷新出库单 - refreshAsn(addForm.getAsnId()); return ResponseDTO.ok(); } @@ -99,10 +100,12 @@ public class AsnDetailService { asnDetailDao.updateById(asnDetailEntity); ItemEntity item = itemDao.selectById(updateForm.getItemId()); - dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "编辑：" + item.getItemCode() + "物料明细", originEntity, asnDetailEntity); //刷新出库单 refreshAsn(updateForm.getAsnId()); + + dataTracerService.addTrace(asnDetailEntity.getAsnId(), DataTracerTypeEnum.ASN, "编辑：" + item.getItemCode() + "物料明细", originEntity, asnDetailEntity); + return ResponseDTO.ok(); } @@ -139,7 +142,7 @@ public class AsnDetailService { //批量删除 asnDetailManager.removeBatchByIds(toDeleteList); //操作记录 - dataTracerService.addTrace(asnIds.get(0), DataTracerTypeEnum.ASN, "批量删除：" + joiner.getSussMsg().toString()); + dataTracerService.addTrace(asnIds.get(0), DataTracerTypeEnum.ASN, "批量删除：" + joiner.getSussMsg().toString()+ joiner.getErrorMsg().toString()); } //刷新出库单 @@ -171,12 +174,13 @@ public class AsnDetailService { asnDetailDao.deleteById(asnDetailId); joiner.getSussMsg().add(item.getItemCode() + "删除成功"); - //操作记录 - dataTracerService.addTrace(asnId, DataTracerTypeEnum.ASN, "删除：" + joiner.getSussMsg().toString()); - //刷新出库单 refreshAsn(asnId); + //操作记录 + dataTracerService.addTrace(asnId, DataTracerTypeEnum.ASN, "删除：" + joiner.getSussMsg().toString()+ joiner.getErrorMsg().toString()); + + return ResponseDTOUtils.buildResponseDTO(joiner); }