详情入库完成操作记录添加

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

详情入库完成操作记录添加
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 02e47a62
Showing 6 changed files with 22 additions and 10 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.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
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -53,7 +53,7 @@ public class WcsController extends HuahengBaseController {
         }
         Result result = handleMultiProcess("warecellAllocation", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = wcsService.warecellAllocation(warecellDomain);
                 return result;
             }
@@ -78,7 +78,7 @@ public class WcsController extends HuahengBaseController {
         Result result = handleMultiProcess("manyEmptyIn", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createManyEmptyInTask(containerCode, zoneCode, roadWay, height, warehouseCode);
                 return result;
             }
@@ -100,7 +100,7 @@ public class WcsController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("manyEmptyOut", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createManyEmptyOutTask(containerCode, toPortCode, warehouseCode);
                 return result;
             }
@@ -120,7 +120,7 @@ public class WcsController extends HuahengBaseController {
         int taskNo = taskFinishEntity.getTaskNo();
         Result result = handleMultiProcess("completeTaskByWMS", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.completeTaskByWMS(taskNo);
                 return result;
             }
@@ -238,7 +238,7 @@ 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)
+    @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)));// 操作日志收集
@@ -60,7 +60,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
         if (receiptHeader == null) {
@@ -104,7 +104,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     @Override
     @Transactional(rollbackFor = ServiceException.class)
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result removeDetailById(String id) {
         ReceiptDetail receiptDetail = receiptDetailService.getById(id);
         if (receiptDetail == null) {
@@ -144,6 +144,8 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
      * @return
      */
     @Override
+    @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单完成'", 
+    msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
     public boolean updateReceiptHeaderStatus(Integer id) {
         LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
         receiptDetailLambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
@@ -173,8 +175,11 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         receiptHeader.setFirstStatus(maxStatus);
         receiptHeader.setLastStatus(minStatus);
-        boolean result = receiptHeaderService.updateById(receiptHeader);
-        return result;
+        if (!receiptHeaderService.updateById(receiptHeader)) {
+            throw new ServiceException("更新入库单：" + receiptHeader.getCode() + " 状态失败");
+        }
+        LogRecordContext.putVariable("receiptHeader", receiptHeader);
+        return true;
     }
     @Override
@@ -89,7 +89,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
     @Override
     @Transactional(rollbackFor = ServiceException.class)
     @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString1", msg = "''", recordReturnValue = true)
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库组盘'", extra = "#extraJsonString2", msg = "'容器编码：' + #receiveList.get(0).getContainerCode()", 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) {
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,12 +66,16 @@ 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.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.monitor4all.logRecord.annotation.OperationLog;
+import cn.monitor4all.logRecord.context.LogRecordContext;
+
 /**
  * @Description: 任务表
  * @Author:      jeecg-boot
@@ -1090,6 +1095,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return            AjaxResult 完成入库任务结果
      */
     @Transactional(rollbackFor = Exception.class)
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情入库'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result completeReceiptTask(TaskHeader taskHeader) {
         if (taskHeader == null) {
             return Result.error("任务未找到，执行中止");
@@ -1239,6 +1245,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (!combineInventoryDetail(taskHeader)) {
             throw new ServiceException("合并入库库存失败");
         }
+        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptDetaiList));
         return Result.ok("完成入库任务");
     }