wms / wms4_globaltaiguogeli · Commits

Commit eb1036babdc187b3789dbc71340a177716a8d388

Authored by 肖超群
2 parents bf161c19 7e94323d

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

Inline Side-by-side
Showing 4 changed files with 22 additions and 11 deletions
ant-design-vue-jeecg/src/components/layouts/RouteView.vue
  View file @eb1036b
... ... @@ -35,6 +35,7 @@ export default {
35 35 },
36 36 //update-end--Author:scott Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
37 37 keepAlive() {
  38 + // this.$route.meta.keepAlive = true
38 39 return this.$route.meta.keepAlive
39 40 }
40 41 },
... ...
ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
  View file @eb1036b
... ... @@ -108,14 +108,14 @@ export default {
108 108 },
109 109 watch: {
110 110 '$route': function (newRoute) {
111   - //console.log("新的路由",newRoute)
  111 + // console.log("新的路由",newRoute)
112 112 this.activePage = newRoute.fullPath
113 113 if (!this.multipage) {
114 114 this.linkList = [newRoute.fullPath]
115 115 this.pageList = [Object.assign({}, newRoute)]
116 116 // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
117 117 } else if (indexKey == newRoute.fullPath) {
118   - //首页时 判断是否缓存 没有缓存 刷新之
  118 + // 首页时 判断是否缓存 没有缓存 刷新之
119 119 if (newRoute.meta.keepAlive === false) {
120 120 this.routeReload()
121 121 }
... ... @@ -124,9 +124,9 @@ export default {
124 124 this.linkList.push(newRoute.fullPath)
125 125 this.pageList.push(Object.assign({}, newRoute))
126 126 //// update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍 #842
127   - // if (newRoute.meta.keepAlive) {
128   - // this.routeReload()
129   - // }
  127 + if (newRoute.meta.keepAlive) {
  128 + this.routeReload()
  129 + }
130 130 //// update-end-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍 #842
131 131 } else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
132 132 let oldIndex = this.linkList.indexOf(newRoute.fullPath)
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
  View file @eb1036b
... ... @@ -411,9 +411,12 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
411 411  
412 412 @Override
413 413 @Transactional(rollbackFor = JeecgBootException.class)
414   - @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString",
415   - msg = "'任务ID：' + #taskHeaderId + '，库位编码：' + #shipmentContainerHeader.getFromLocationCode() + '，容器编码：' + #shipmentContainerHeader.getContainerCode() + '，目标出入口：' + #shipmentContainerHeader.getToPort()",
  414 + @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString1",
  415 + msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #shipmentContainerHeader.getFromLocationCode() + '，容器编码：' + #shipmentContainerHeader.getContainerCode() + '，目标出入口：' + #shipmentContainerHeader.getToPort()",
416 416 condition = "#shipmentContainerDetailList.size() > 0", recordReturnValue = true)
  417 + @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务生成'", extra = "#extraJsonString2",
  418 + msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
  419 + condition = "#taskDetailList.size() > 0", recordReturnValue = true)
417 420 public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
418 421 Integer preTaskNo = 0;
419 422 if (shipmentContainerHeader == null) {
... ... @@ -557,9 +560,11 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
557 560 throw new JeecgBootException("生成出库任务时, 更新库存头失败");
558 561 }
559 562 }
560   - LogRecordContext.putVariable("taskHeaderId", taskHeaderId);// 操作日志收集
  563 + LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集
561 564 LogRecordContext.putVariable("shipmentContainerDetailList", shipmentContainerDetailList);// 操作日志收集
562   - LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(shipmentContainerDetailList));// 操作日志收集
  565 + LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(shipmentContainerDetailList));// 操作日志收集
  566 + LogRecordContext.putVariable("taskDetailList", taskDetailList);// 操作日志收集
  567 + LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(taskDetailList));// 操作日志收集
563 568 return Result.OK("生成出库任务成功");
564 569 }
565 570  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @eb1036b
... ... @@ -1235,11 +1235,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1235 1235 }
1236 1236 }
1237 1237 receiptDetaiList = receiptDetaiList.stream().filter(t -> t.getStatus().equals(QuantityConstant.RECEIPT_HEADER_COMPLETED)).collect(Collectors.toList());
  1238 + LogRecordContext.putVariable("taskHeader", taskHeader);
1238 1239 LogRecordContext.putVariable("taskDetailList", taskDetailList);
1239 1240 LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
1240 1241 LogRecordContext.putVariable("receiptDetaiList", receiptDetaiList);
1241 1242 LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(receiptDetaiList));
1242   - LogRecordContext.putVariable("taskHeader", taskHeader);
1243 1243 return Result.ok("完成入库任务");
1244 1244 }
1245 1245  
... ... @@ -1250,6 +1250,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1250 1250 */
1251 1251 @Override
1252 1252 @Transactional(rollbackFor = Exception.class)
  1253 + @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
  1254 + msg = "'任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
  1255 + condition = "#taskDetailList.size() > 0", recordReturnValue = true)
1253 1256 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
1254 1257 msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
1255 1258 recordReturnValue = true)
... ... @@ -1432,8 +1435,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1432 1435 }
1433 1436 // 操作记录添加
1434 1437 shipmentDetailList = shipmentDetailList.stream().filter(t -> t.getStatus().equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)).collect(Collectors.toList());
1435   - LogRecordContext.putVariable("shipmentDetailList", shipmentDetailList); // 操作记录添加
  1438 + LogRecordContext.putVariable("taskHeader", taskHeader);
  1439 + LogRecordContext.putVariable("taskDetailList", taskDetailList); // 操作记录添加
1436 1440 LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
  1441 + LogRecordContext.putVariable("shipmentDetailList", shipmentDetailList);
1437 1442 LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(shipmentDetailList));
1438 1443 return Result.ok("完成出库任务");
1439 1444 }
... ...