From cbe19d7043ec89420df96d52f7c6130ad9c12bdc Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Fri, 24 Feb 2023 17:05:22 +0800
Subject: [PATCH] 入库组盘日志记录提交
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java | 18 +++++++++++++++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java | 11 ++++++++++-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java | 6 ++----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java | 1 -
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java | 6 ++++--
5 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
index e431c94..820577d 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
@@ -45,17 +45,23 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
if (receiptContainerDetail == null || receiptContainerDetail.getUniqueCode() == null) {
continue;
}
- String msg = StrUtil.format("上游单号：{}，入库单据号：{}，仓库编码：{}，托盘编码：{}，物料编码：{}，数量：{}", receiptContainerDetail.getReferCode(),
+ String operationMsg = null;
+ String msg = StrUtil.format("上游单号：{}，入库单据号：{}，仓库编码：{}，容器编码：{}，物料编码：{}，数量：{}", receiptContainerDetail.getReferCode(),
receiptContainerDetail.getReceiptCode(), receiptContainerDetail.getWarehouseCode(), receiptContainerDetail.getContainerCode(),
receiptContainerDetail.getMaterialCode(), receiptContainerDetail.getQty());
+ if (!StringUtils.isEmpty(logDTO.getMsg())) {
+ operationMsg = logDTO.getMsg() + "，" + msg;
+ } else {
+ operationMsg = msg;
+ }
OperationLog operationLog = new OperationLog();
operationLog.setBizId(receiptContainerDetail.getUniqueCode());
+ operationLog.setOperationMsg(StringUtils.substring(operationMsg, 0, 1000));
operationLog.setBizType(logDTO.getBizType());
operationLog.setBizTag(logDTO.getTag());
operationLog.setContentException(StringUtils.substring(logDTO.getException(), 0, 1000));
operationLog.setContentReturn(StringUtils.substring(logDTO.getReturnStr(), 0, 1000));
operationLog.setOperationCostTime(logDTO.getExecutionTime());
- operationLog.setOperationMsg(StringUtils.substring(msg, 0, 1000));
operationLog.setOperationStatus(logDTO.getSuccess().equals(true) ? 1 : 0);
operationLog.setOperationTime(logDTO.getOperateDate());
operationLog.setOperatorName(logDTO.getOperatorId());
@@ -71,10 +77,16 @@ public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, Ope
if (receiptDetail == null || receiptDetail.getReceiptCode() == null) {
continue;
}
+ String operationMsg = null;
String msg = StrUtil.format("物料编码：{}，数量：{}，已收数量：{}", receiptDetail.getMaterialCode(), receiptDetail.getQty(), receiptDetail.getTaskQty());
+ if (!StringUtils.isEmpty(logDTO.getMsg())) {
+ operationMsg = logDTO.getMsg() + "，" + msg;
+ } else {
+ operationMsg = msg;
+ }
OperationLog operationLog = new OperationLog();
operationLog.setBizId(receiptDetail.getReceiptCode());
- operationLog.setOperationMsg(StringUtils.substring(msg, 0, 1000));
+ operationLog.setOperationMsg(StringUtils.substring(operationMsg, 0, 1000));
operationLog.setBizType(logDTO.getBizType());
operationLog.setBizTag(logDTO.getTag());
operationLog.setContentException(StringUtils.substring(logDTO.getException(), 0, 1000));
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
index 74fb9e0..cd6be42 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.wms.receipt.receiptHeader.controller;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -42,6 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,6 +52,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import cn.monitor4all.logRecord.annotation.OperationLog;
+import cn.monitor4all.logRecord.context.LogRecordContext;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -219,8 +224,8 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
*/
@AutoLog(value = "入库单详情-添加")
@ApiOperation(value = "入库单详情-添加", notes = "入库单详情-添加")
- @PostMapping(value = "/addReceiptDetail")
@RequiresPermissions("receiptDetail:add")
+ @PostMapping(value = "/addReceiptDetail")
public Result<?> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
return receiptDetailService.saveReceiptDetail(receiptDetail);
}
@@ -234,8 +239,10 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@ApiOperation(value = "入库单详情-编辑", notes = "入库单详情-编辑")
@RequiresPermissions("receiptDetail:edit")
@RequestMapping(value = "/editReceiptDetail", method = {RequestMethod.PUT, RequestMethod.POST})
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情编辑'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
public Result<String> editReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
receiptDetailService.updateById(receiptDetail);
+ LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
return Result.OK("编辑成功!");
}
@@ -248,6 +255,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@ApiOperation(value = "入库单详情-通过id删除", notes = "入库单详情-通过id删除")
@RequiresPermissions("receiptDetail:delete")
@DeleteMapping(value = "/deleteReceiptDetail")
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
public Result<String> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
ReceiptDetail receiptDetail = receiptDetailService.getById(id);
if (receiptDetail == null) {
@@ -268,6 +276,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
if (!success) {
throw new ServiceException("更新入库单头数量失败");
}
+ LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
return Result.OK("删除成功!");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
index 69c1ca5..c83beb2 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
@@ -16,6 +16,7 @@ import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -88,10 +89,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
if (!success) {
throw new ServiceException("添加失败, 保存入库单详失败");
}
- // 操作日志收集
- List<ReceiptDetail> receiptDetailList = new ArrayList<ReceiptDetail>();
- receiptDetailList.add(receiptDetail);
- LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptDetailList));
+ LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
return Result.OK("添加成功！");
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
index 62f1196..1454c2c 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
@@ -124,7 +124,6 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R
@Override
@Transactional
public String createCode(String receiptType) {
- int i = 0;
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
index 889e2f0..9ca75f5 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -88,7 +88,8 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> impl
*/
@Override
@Transactional(rollbackFor = ServiceException.class)
- @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
+ @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString1", msg = "''", recordReturnValue = true)
+ @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库组盘'", extra = "#extraJsonString2", msg = "'容器编码：' + #receiveList.get(0).getContainerCode()", recordReturnValue = true)
public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
boolean result = false;
if (receiveList == null || receiveList.size() == 0) {
@@ -236,7 +237,8 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> impl
throw new ServiceException("保存入库组盘详情失败");
}
}
- LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
+ LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(receiptContainerDetailList));
+ LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(receiptDetailList));
return Result.OK("收货成功", receiptContainerHeader);
}
}
--
libgit2 0.22.2