入库组盘日志记录提交

Signed-off-by: TanYibin <5491541@qq.com>

入库组盘日志记录提交
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 99795bb1
Showing 5 changed files with 31 additions and 11 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -45,17 +45,23 @@ public class OperationLogServiceImpl extends ServiceImpl&lt;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&lt;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));
 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&lt;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&lt;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&lt;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&lt;ReceiptHeader, IRec
         if (!success) {
             throw new ServiceException("更新入库单头数量失败");
         }
+        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
         return Result.OK("删除成功!");
     }
@@ -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&lt;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("添加成功！");
     }
 }
@@ -124,7 +124,6 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     @Override
     @Transactional
     public String createCode(String receiptType) {
-        int i = 0;
         String code = null;
         Date now = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
@@ -88,7 +88,8 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; 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&lt;ReceiveMapper, Receive&gt; 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);
     }
 }