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

肖超群
2 parents bf161c19 7e94323d
Showing 4 changed files with 22 additions and 11 deletions
ant-design-vue-jeecg/src/components/layouts/RouteView.vue
ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -35,6 +35,7 @@ export default {
     },
     //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
     keepAlive() {
+      // this.$route.meta.keepAlive = true
       return this.$route.meta.keepAlive
     }
   },
@@ -108,14 +108,14 @@ export default {
   },
   watch: {
     '$route': function (newRoute) {
-      //console.log("新的路由",newRoute)
+      // console.log("新的路由",newRoute)
       this.activePage = newRoute.fullPath
       if (!this.multipage) {
         this.linkList = [newRoute.fullPath]
         this.pageList = [Object.assign({}, newRoute)]
         // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
       } else if (indexKey == newRoute.fullPath) {
-        //首页时 判断是否缓存 没有缓存 刷新之
+        // 首页时 判断是否缓存 没有缓存 刷新之
         if (newRoute.meta.keepAlive === false) {
           this.routeReload()
         }
@@ -124,9 +124,9 @@ export default {
         this.linkList.push(newRoute.fullPath)
         this.pageList.push(Object.assign({}, newRoute))
         //// update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍 #842
-        // if (newRoute.meta.keepAlive) {
-        //   this.routeReload()
-        // }
+        if (newRoute.meta.keepAlive) {
+          this.routeReload()
+        }
         //// update-end-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍 #842
       } else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
         let oldIndex = this.linkList.indexOf(newRoute.fullPath)
@@ -411,9 +411,12 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     @Override
     @Transactional(rollbackFor = JeecgBootException.class)
-    @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString",
-        msg = "'任务ID：' + #taskHeaderId + '，库位编码：' + #shipmentContainerHeader.getFromLocationCode() + '，容器编码：' + #shipmentContainerHeader.getContainerCode() + '，目标出入口：' + #shipmentContainerHeader.getToPort()",
+    @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString1",
+        msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #shipmentContainerHeader.getFromLocationCode() + '，容器编码：' + #shipmentContainerHeader.getContainerCode() + '，目标出入口：' + #shipmentContainerHeader.getToPort()",
         condition = "#shipmentContainerDetailList.size() > 0", recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务生成'", extra = "#extraJsonString2",
+        msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
+        condition = "#taskDetailList.size() > 0", recordReturnValue = true)
     public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
         Integer preTaskNo = 0;
         if (shipmentContainerHeader == null) {
@@ -557,9 +560,11 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
                 throw new JeecgBootException("生成出库任务时, 更新库存头失败");
             }
         }
-        LogRecordContext.putVariable("taskHeaderId", taskHeaderId);// 操作日志收集
+        LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集
         LogRecordContext.putVariable("shipmentContainerDetailList", shipmentContainerDetailList);// 操作日志收集
-        LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(shipmentContainerDetailList));// 操作日志收集
+        LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(shipmentContainerDetailList));// 操作日志收集
+        LogRecordContext.putVariable("taskDetailList", taskDetailList);// 操作日志收集
+        LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(taskDetailList));// 操作日志收集
         return Result.OK("生成出库任务成功");
     }
@@ -1235,11 +1235,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
         }
         receiptDetaiList = receiptDetaiList.stream().filter(t -> t.getStatus().equals(QuantityConstant.RECEIPT_HEADER_COMPLETED)).collect(Collectors.toList());
+        LogRecordContext.putVariable("taskHeader", taskHeader);
         LogRecordContext.putVariable("taskDetailList", taskDetailList);
         LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
         LogRecordContext.putVariable("receiptDetaiList", receiptDetaiList);
         LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(receiptDetaiList));
-        LogRecordContext.putVariable("taskHeader", taskHeader);
         return Result.ok("完成入库任务");
     }
@@ -1250,6 +1250,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
+    msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
+    condition = "#taskDetailList.size() > 0", recordReturnValue = true)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
         msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
         recordReturnValue = true)
@@ -1432,8 +1435,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         // 操作记录添加
         shipmentDetailList = shipmentDetailList.stream().filter(t -> t.getStatus().equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)).collect(Collectors.toList());
-        LogRecordContext.putVariable("shipmentDetailList", shipmentDetailList); // 操作记录添加
+        LogRecordContext.putVariable("taskHeader", taskHeader);
+        LogRecordContext.putVariable("taskDetailList", taskDetailList); // 操作记录添加
         LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
+        LogRecordContext.putVariable("shipmentDetailList", shipmentDetailList);
         LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(shipmentDetailList));
         return Result.ok("完成出库任务");
     }