wms / wms4_hubeijili · Commits

Commit 1675b4503c4391c0a14dac5a843c3342191de9fc

Authored by 谭毅彬
1 parent e0ab99bf

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

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 5 changed files with 20 additions and 19 deletions
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
  View file @1675b45
... ... @@ -24,7 +24,7 @@
24 24 <j-input placeholder="请输入操作内容" v-model="queryParam.operationMsg"></j-input>
25 25 </a-form-item>
26 26 </a-col>
27   - <a-col :xl="10" :lg="11" :md="12" :sm="24">
  27 + <a-col :xl="12" :lg="7" :md="8" :sm="24">
28 28 <a-form-item label="创建日期">
29 29 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
30 30 class="query-group-cust" v-model="queryParam.operationTime_begin"></j-date>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @1675b45
... ... @@ -252,8 +252,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
252 252 @ApiOperation(value = "入库单详情-通过id删除", notes = "入库单详情-通过id删除")
253 253 @RequiresPermissions("receiptDetail:delete")
254 254 @DeleteMapping(value = "/deleteReceiptDetail")
255   - @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
256   - public Result<String> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
  255 + public Result<?> deleteReceiptDetail(@RequestParam(name = "id", required = true) String id) {
257 256 Result result = receiptDetailService.removeDetailById(id);
258 257 return result;
259 258 }
... ... @@ -267,7 +266,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
267 266 @ApiOperation(value = "入库单详情-批量删除", notes = "入库单详情-批量删除")
268 267 @RequiresPermissions("receiptDetail:deleteBatch")
269 268 @DeleteMapping(value = "/deleteBatchReceiptDetail")
270   - public Result<String> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
  269 + public Result<?> deleteBatchReceiptDetail(@RequestParam(name = "ids", required = true) String ids) {
271 270 Result result = receiptDetailService.removeDetailListById(Arrays.asList(ids.split(",")));
272 271 return result;
273 272 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
  View file @1675b45
... ... @@ -60,7 +60,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
60 60 }
61 61  
62 62 @Override
63   - @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", recordReturnValue = true)
  63 + @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
64 64 public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
65 65 ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
66 66 if (receiptHeader == null) {
... ... @@ -104,6 +104,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
104 104  
105 105 @Override
106 106 @Transactional(rollbackFor = ServiceException.class)
  107 + @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
107 108 public Result removeDetailById(String id) {
108 109 ReceiptDetail receiptDetail = receiptDetailService.getById(id);
109 110 if (receiptDetail == null) {
... ... @@ -128,6 +129,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
128 129 if (!success) {
129 130 throw new ServiceException("更新入库单头数量失败");
130 131 }
  132 + LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(Collections.singletonList(receiptDetail)));// 操作日志收集
131 133 return Result.OK("删除成功!");
132 134 }
133 135  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
  View file @1675b45
... ... @@ -270,7 +270,7 @@ public class TaskHeaderController extends HuahengBaseController {
270 270 String selections = request.getParameter("selections");
271 271 if (oConvertUtils.isNotEmpty(selections)) {
272 272 List<String> selectionList = Arrays.asList(selections.split(","));
273   - exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
  273 + exportList = pageList.stream().filter(item -> selectionList.contains(item.getId().toString())).collect(Collectors.toList());
274 274 } else {
275 275 exportList = pageList;
276 276 }
... ... @@ -337,7 +337,7 @@ public class TaskHeaderController extends HuahengBaseController {
337 337 Integer taskId = taskHeader.getId();
338 338 Result result = handleMultiProcess("completeTaskByWMS", new MultiProcessListener() {
339 339 @Override
340   - public Result doProcess() {
  340 + public Result<?> doProcess() {
341 341 Result result = taskHeaderService.completeTaskByWMS(taskId);
342 342 return result;
343 343 }
... ... @@ -362,7 +362,7 @@ public class TaskHeaderController extends HuahengBaseController {
362 362 for (int taskId : idList) {
363 363 result = handleMultiProcess("cancelTask", new MultiProcessListener() {
364 364 @Override
365   - public Result doProcess() {
  365 + public Result<?> doProcess() {
366 366 Result result = taskHeaderService.cancelTask(taskId);
367 367 return result;
368 368 }
... ... @@ -385,7 +385,7 @@ public class TaskHeaderController extends HuahengBaseController {
385 385 Integer taskId = taskHeader.getId();
386 386 Result result = handleMultiProcess("execute", new MultiProcessListener() {
387 387 @Override
388   - public Result doProcess() {
  388 + public Result<?> doProcess() {
389 389 Result result = taskHeaderService.sendTaskToWcs(taskId);
390 390 return result;
391 391 }
... ... @@ -400,13 +400,13 @@ public class TaskHeaderController extends HuahengBaseController {
400 400 @ApiOperation(value = "任务表-创建空托入库任务", notes = "任务表-创建空托入库任务")
401 401 @PostMapping("/createEmptyIn")
402 402 @RequiresPermissions("taskHeader:emptyIn")
403   - public Result<TaskHeader> createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
  403 + public Result createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
404 404 String contaienrCode = taskHeader.getContainerCode();
405 405 String toLocationCode = taskHeader.getToLocationCode();
406 406 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
407 407 Result result = handleMultiProcess("createEmptyIn", new MultiProcessListener() {
408 408 @Override
409   - public Result doProcess() {
  409 + public Result<?> doProcess() {
410 410 Result result = taskHeaderService.createEmptyIn(contaienrCode, toLocationCode, warehouseCode);
411 411 return result;
412 412 }
... ... @@ -427,7 +427,7 @@ public class TaskHeaderController extends HuahengBaseController {
427 427 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
428 428 Result result = handleMultiProcess("createEmptyOut", new MultiProcessListener() {
429 429 @Override
430   - public Result doProcess() {
  430 + public Result<?> doProcess() {
431 431 Result result = taskHeaderService.createEmptyOut(contaienrCode, toPortCode, warehouseCode);
432 432 return result;
433 433 }
... ... @@ -448,7 +448,7 @@ public class TaskHeaderController extends HuahengBaseController {
448 448 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
449 449 Result result = handleMultiProcess("createTransferTask", new MultiProcessListener() {
450 450 @Override
451   - public Result doProcess() {
  451 + public Result<?> doProcess() {
452 452 Result result = taskHeaderService.createTransferTask(fromLocationCode, toLocationCode, warehouseCode);
453 453 return result;
454 454 }
... ... @@ -469,7 +469,7 @@ public class TaskHeaderController extends HuahengBaseController {
469 469 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
470 470 Result result = handleMultiProcess("createCheckOutTask", new MultiProcessListener() {
471 471 @Override
472   - public Result doProcess() {
  472 + public Result<?> doProcess() {
473 473 Result result = taskHeaderService.createCheckOutTask(containerCode, toPortCode, warehouseCode);
474 474 return result;
475 475 }
... ... @@ -491,7 +491,7 @@ public class TaskHeaderController extends HuahengBaseController {
491 491 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
492 492 Result result = handleMultiProcess("createOverStationTask", new MultiProcessListener() {
493 493 @Override
494   - public Result doProcess() {
  494 + public Result<?> doProcess() {
495 495 Result result = taskHeaderService.createOverStationTask(containerCode, fromPortCode, toPortCode, warehouseCode);
496 496 return result;
497 497 }
... ... @@ -512,7 +512,7 @@ public class TaskHeaderController extends HuahengBaseController {
512 512 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
513 513 Result result = handleMultiProcess("createManyEmptyIn", new MultiProcessListener() {
514 514 @Override
515   - public Result doProcess() {
  515 + public Result<?> doProcess() {
516 516 Result result = taskHeaderService.createManyEmptyIn(containerCode, toLocationCode, warehouseCode);
517 517 return result;
518 518 }
... ... @@ -533,7 +533,7 @@ public class TaskHeaderController extends HuahengBaseController {
533 533 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
534 534 Result result = handleMultiProcess("createManyEmptyOut", new MultiProcessListener() {
535 535 @Override
536   - public Result doProcess() {
  536 + public Result<?> doProcess() {
537 537 Result result = taskHeaderService.createManyEmptyOut(containerCode, toPortCode, warehouseCode);
538 538 return result;
539 539 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @1675b45
... ... @@ -1095,7 +1095,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1095 1095 return Result.error("任务未找到，执行中止");
1096 1096 }
1097 1097 String warehouseCode = taskHeader.getWarehouseCode();
1098   - String fromLocationCode = taskHeader.getFromLocationCode();
  1098 +// String fromLocationCode = taskHeader.getFromLocationCode();
1099 1099 String toLocationCode = taskHeader.getToLocationCode();
1100 1100 String zoneCode = taskHeader.getZoneCode();
1101 1101 String containerCode = taskHeader.getContainerCode();
... ... @@ -1255,7 +1255,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1255 1255 String warehouseCode = taskHeader.getWarehouseCode();
1256 1256 String fromLocationCode = taskHeader.getFromLocationCode();
1257 1257 String toLocationCode = taskHeader.getToLocationCode();
1258   - String zoneCode = taskHeader.getZoneCode();
  1258 +// String zoneCode = taskHeader.getZoneCode();
1259 1259 String containerCode = taskHeader.getContainerCode();
1260 1260 int taskType = taskHeader.getTaskType();
1261 1261 List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskHeader.getId());
... ...