Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

# Conflicts: # ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue # 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

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
# Conflicts: # ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue # 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
肖超群
2 parents 63e6b873 55808231
Showing 11 changed files with 91 additions and 70 deletions
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/TestController.java
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/monitor/operation/service/impl/OperatorIdGetServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.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
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="业务ID">
-              <a-input placeholder="请输入业务ID" v-model="queryParam.bizId"></a-input>
+              <j-input placeholder="请输入业务ID" v-model="queryParam.bizId"></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -19,22 +19,30 @@
               <j-multi-select-tag placeholder="请选择业务标签" v-model="queryParam.bizTag" dictCode="operation_log_tag"/>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="操作内容">
               <j-input placeholder="请输入操作内容" v-model="queryParam.operationMsg"></j-input>
             </a-form-item>
           </a-col>
-          </template>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="创建日期">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
+                      class="query-group-cust" v-model="queryParam.operationTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
+                      class="query-group-cust" v-model="queryParam.operationTime_end"></j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="操作结果状态">
+              <a-input placeholder="请输入操作结果状态容" v-model="queryParam.operationStatus"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="handleExportXls('操作记录')" icon="download" style="margin-left: 8px">导出</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -14,13 +14,12 @@
               <j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="receipt_task_type"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="状态">
+              <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="状态">
-                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始库位">
                 <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
               </a-form-item>
@@ -64,9 +63,8 @@
     <div class="table-operator">
       <a-button v-has="'receiptContainerHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('入库组盘')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
@@ -75,12 +73,6 @@
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -117,13 +109,12 @@
           </a-button>
         </template>
-        <span slot="action" slot-scope="text, record">
-          <a-divider type="vertical"/>
+       <span slot="action" slot-scope="text, record">
           <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)">生成任务</a>
           <a v-else-if="record.status == 0" @click="createTask(record)">生成任务</a>
           <a-divider type="vertical"/>
-          <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消组盘吗?" @confirm="() => handleDelete(record.id)">
-            <a>取消组盘</a>
+          <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
+            <a>取消配盘</a>
           </a-popconfirm>
           <a-divider type="vertical"/>
           <a-dropdown>
@@ -43,14 +43,12 @@ public class AcsController extends HuahengBaseController {
 //    @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
     @ResponseBody
     @PostMapping(value = "/testTokenCheck")
-    @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
-    operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
     public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
 //        String audience = ApiAuthentication.getInstance().getAudience();
 //        String url = "http://localhost:8080/wms/api/wms/acs/testTokenCheck";
 //        String body = OkHttpUtils.sendPostByJsonStr(url, JSON.toJSONString(paramMap));
 //        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_AGV_TASK_ASSIGN);
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         return Result.ok();
     }
@@ -52,8 +52,7 @@ public class TestController extends HuahengBaseController {
 //    @AutoLog(value = "TestController-testRedis")
     @ResponseBody
     @PostMapping(value = "/test/testRedis")
-    @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
-        operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
     public Result<?> testRedis(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws InterruptedException {
         Result result = new Result<>();
         String testString = "我是testString1";
@@ -71,7 +70,6 @@ public class TestController extends HuahengBaseController {
         Map<String, ReceiptHeader> value = redisUtil.getAndSet(key, receiptHeaderMap, new TypeReference<Map<String, ReceiptHeader>>() {}, 10);
         Long rxpireTime = redisUtil.getExpire(key);
         log.info("redisUtil.getAndSet {} -> {} rxpireTime -> {}", key, JSON.toJSONString(value), rxpireTime);
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
 //        result.setSuccess(false);
 //        LogRecordContext.putVariable("isSuccess", result.isSuccess());
@@ -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.monitor.operation.service.impl;
+
+import org.jeecg.utils.HuahengJwtUtil;
+import org.springframework.stereotype.Component;
+
+import cn.monitor4all.logRecord.service.IOperatorIdGetService;
+
+@Component
+public class OperatorIdGetServiceImpl implements IOperatorIdGetService {
+
+    @Override
+    public String getOperatorId() throws Exception {
+        return HuahengJwtUtil.getCurrentOperator();
+    }
+
+}
@@ -6,6 +6,7 @@ import java.util.List;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,7 +30,7 @@ public interface IReceiptContainerHeaderService extends IService&lt;ReceiptContaine
     ReceiptContainerHeader getUnCompleteReceiptContainerByCode(String containerCode, String warehouseCode);
-    public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
+    public Result<TaskHeader> createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
     boolean updateStatusById(int status, int id);
 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,12 +44,15 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
 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;
@@ -107,13 +112,12 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "入库表主表-添加", notes = "入库表主表-添加")
     @PostMapping(value = "/add")
     @RequiresPermissions("receiptHeader:add")
-    public Result<String> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
+    public Result<ReceiptHeader> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         if (StringUtils.isNotEmpty(warehouseCode)) {
             receiptHeader.setWarehouseCode(warehouseCode);
         }
-        Result result = receiptHeaderService.saveReceiptHeader(receiptHeader);
-        return result;
+        return receiptHeaderService.saveReceiptHeader(receiptHeader);
     }
     /**
@@ -218,10 +222,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
      */
     @AutoLog(value = "入库单详情-添加")
     @ApiOperation(value = "入库单详情-添加", notes = "入库单详情-添加")
-    @PostMapping(value = "/addReceiptDetail")
     @RequiresPermissions("receiptDetail:add")
-    public Result<String> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
-        Result result = receiptDetailService.saveReceiptDetail(receiptDetail);
+    @PostMapping(value = "/addReceiptDetail")
         return result;
     }
@@ -234,8 +236,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,8 +252,8 @@ 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) {
-        return receiptDetailService.removeDetailById(id);
     }
     /**
@@ -262,7 +266,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @RequiresPermissions("receiptDetail:deleteBatch")
     @DeleteMapping(value = "/deleteBatchReceiptDetail")
     public Result<String> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
-        return receiptDetailService.removeDetailListById(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
     }
     /**
@@ -345,8 +349,6 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "回传入库单", notes = "回传入库单")
     @RequiresPermissions("receiptHeader:back")
     @RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
-        Result result = erpService.backReceipt(receiptHeader);
         return result;
     }
@@ -21,9 +21,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.alibaba.fastjson.JSON;
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.monitor4all.logRecord.annotation.OperationLog;
 import cn.monitor4all.logRecord.context.LogRecordContext;
@@ -51,19 +53,16 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         return receiptDetailMapper.selectByMainId(mainId);
     }
-    @Override
-    public boolean save(ReceiptDetail entity) {
+	 @Override
+	public boolean save(ReceiptDetail entity) {
         BigDecimal qty = entity.getQty();
         if (qty.compareTo(BigDecimal.ZERO) < 0) {
             throw new ServiceException("单据数量不能小于0");
         }
         return super.save(entity);
     }
-
     @Override
-    @Transactional(rollbackFor = ServiceException.class)
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", recordReturnValue = true)
-    public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", recordReturnValue = true)    public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
         if (receiptHeader == null) {
             return Result.error("添加失败，没有找到入库单头");
@@ -100,11 +99,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("username", HuahengJwtUtil.getCurrentOperator());
-        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptDetailList));
+        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
         return Result.OK("添加成功！");
     }
@@ -66,12 +66,14 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
      */
     @Override
     @Transactional
-    public boolean delMain(String id,String reason) {
+    @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单删除'",
+        msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
+    public boolean delMain(String id, String reason) {
         ReceiptHeader receiptHeader = getById(id);
         if (receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
             throw new ServiceException("不能删除非新建状态单据");
         }
-        receiptHeaderHistoryService.saveById(id,reason);
+        receiptHeaderHistoryService.saveById(id, reason);
         boolean success = receiptDetailMapper.deleteByMainId(id);
         if (!success) {
@@ -97,7 +99,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     @Override
     @Transactional
     @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单生成'", 
-    msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", operatorId = "#username", recordReturnValue = true)
+    msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
     public Result<ReceiptHeader> saveReceiptHeader(ReceiptHeader receiptHeader) {
         LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getType()).eq(ReceiptType::getWarehouseCode, receiptHeader.getWarehouseCode());
@@ -116,14 +118,12 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         if (!success) {
             return Result.OK("添加失败！");
         }
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         return Result.OK("添加成功！", receiptHeader);
     }
     @Override
     @Transactional
     public String createCode(String receiptType) {
-        int i = 0;
         String code = null;
         Date now = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
@@ -88,8 +88,8 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
      */
     @Override
     @Transactional(rollbackFor = ServiceException.class)
-    @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''",
-        operatorId = "#username", 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) {
@@ -237,8 +237,8 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
                 throw new ServiceException("保存入库组盘详情失败");
             }
         }
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
-        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
+        LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(receiptContainerDetailList));
+        LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(receiptDetailList));
         return Result.OK("收货成功", receiptContainerHeader);
     }
 }