入库详情操作记录代码提交

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

入库详情操作记录代码提交
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent e0ab99bf
Showing 5 changed files with 20 additions and 19 deletions
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.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
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -24,7 +24,7 @@
               <j-input placeholder="请输入操作内容" v-model="queryParam.operationMsg"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+          <a-col :xl="12" :lg="7" :md="8" :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>
@@ -252,8 +252,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) {
+    public Result<?> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
         Result result = receiptDetailService.removeDetailById(id);
         return result;
     }
@@ -267,7 +266,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "入库单详情-批量删除", notes = "入库单详情-批量删除")
     @RequiresPermissions("receiptDetail:deleteBatch")
     @DeleteMapping(value = "/deleteBatchReceiptDetail")
-    public Result<String> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
+    public Result<?> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
         Result result = receiptDetailService.removeDetailListById(Arrays.asList(ids.split(",")));
         return result;
     }
@@ -60,7 +60,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", 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,6 +104,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     @Override
     @Transactional(rollbackFor = ServiceException.class)
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result removeDetailById(String id) {
         ReceiptDetail receiptDetail = receiptDetailService.getById(id);
         if (receiptDetail == null) {
@@ -128,6 +129,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         if (!success) {
             throw new ServiceException("更新入库单头数量失败");
         }
+        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
         return Result.OK("删除成功!");
     }
@@ -270,7 +270,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String selections = request.getParameter("selections");
         if (oConvertUtils.isNotEmpty(selections)) {
             List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId().toString())).collect(Collectors.toList());
         } else {
             exportList = pageList;
         }
@@ -337,7 +337,7 @@ public class TaskHeaderController extends HuahengBaseController {
         Integer taskId = taskHeader.getId();
         Result result = handleMultiProcess("completeTaskByWMS", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.completeTaskByWMS(taskId);
                 return result;
             }
@@ -362,7 +362,7 @@ public class TaskHeaderController extends HuahengBaseController {
         for (int taskId : idList) {
             result = handleMultiProcess("cancelTask", new MultiProcessListener() {
                 @Override
-                public Result doProcess() {
+                public Result<?> doProcess() {
                     Result result = taskHeaderService.cancelTask(taskId);
                     return result;
                 }
@@ -385,7 +385,7 @@ public class TaskHeaderController extends HuahengBaseController {
         Integer taskId = taskHeader.getId();
         Result result = handleMultiProcess("execute", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.sendTaskToWcs(taskId);
                 return result;
             }
@@ -400,13 +400,13 @@ public class TaskHeaderController extends HuahengBaseController {
     @ApiOperation(value = "任务表-创建空托入库任务", notes = "任务表-创建空托入库任务")
     @PostMapping("/createEmptyIn")
     @RequiresPermissions("taskHeader:emptyIn")
-    public Result<TaskHeader> createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
+    public Result createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
         String contaienrCode = taskHeader.getContainerCode();
         String toLocationCode = taskHeader.getToLocationCode();
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createEmptyIn", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createEmptyIn(contaienrCode, toLocationCode, warehouseCode);
                 return result;
             }
@@ -427,7 +427,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createEmptyOut", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createEmptyOut(contaienrCode, toPortCode, warehouseCode);
                 return result;
             }
@@ -448,7 +448,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createTransferTask", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createTransferTask(fromLocationCode, toLocationCode, warehouseCode);
                 return result;
             }
@@ -469,7 +469,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createCheckOutTask", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createCheckOutTask(containerCode, toPortCode, warehouseCode);
                 return result;
             }
@@ -491,7 +491,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createOverStationTask", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createOverStationTask(containerCode, fromPortCode, toPortCode, warehouseCode);
                 return result;
             }
@@ -512,7 +512,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createManyEmptyIn", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createManyEmptyIn(containerCode, toLocationCode, warehouseCode);
                 return result;
             }
@@ -533,7 +533,7 @@ public class TaskHeaderController extends HuahengBaseController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result result = handleMultiProcess("createManyEmptyOut", new MultiProcessListener() {
             @Override
-            public Result doProcess() {
+            public Result<?> doProcess() {
                 Result result = taskHeaderService.createManyEmptyOut(containerCode, toPortCode, warehouseCode);
                 return result;
             }
@@ -1095,7 +1095,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("任务未找到，执行中止");
         }
         String warehouseCode = taskHeader.getWarehouseCode();
-        String fromLocationCode = taskHeader.getFromLocationCode();
+//        String fromLocationCode = taskHeader.getFromLocationCode();
         String toLocationCode = taskHeader.getToLocationCode();
         String zoneCode = taskHeader.getZoneCode();
         String containerCode = taskHeader.getContainerCode();
@@ -1255,7 +1255,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         String warehouseCode = taskHeader.getWarehouseCode();
         String fromLocationCode = taskHeader.getFromLocationCode();
         String toLocationCode = taskHeader.getToLocationCode();
-        String zoneCode = taskHeader.getZoneCode();
+//        String zoneCode = taskHeader.getZoneCode();
         String containerCode = taskHeader.getContainerCode();
         int taskType = taskHeader.getTaskType();
         List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskHeader.getId());