From 8f7af0507c883e5df9f8a4b2eb703946788c3363 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 15:35:12 +0800 Subject: [PATCH] 盘点任务优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index a7c8e9a..2e66a96 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java @@ -761,7 +761,8 @@ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒"); } } - + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) { + } if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) { @@ -842,7 +843,7 @@ throw new CoolException("鍘熷崟鎹姸鎬佷慨鏀瑰け璐ワ紒锛�"); } - AsnOrderItem orderItem = outStockItemService.getById(item.getSource()); + WkOrderItem orderItem = outStockItemService.getById(item.getSource()); if (Objects.isNull(orderItem)) { throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗗凡涓嶅瓨鍦紒锛�"); } @@ -1063,7 +1064,7 @@ throw new CoolException(e.getMessage()); } } else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) { - AsnOrderItem orderItem = asnOrderItemService.getById(key); + WkOrderItem orderItem = asnOrderItemService.getById(key); if (Objects.isNull(orderItem)) { throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); } @@ -1125,7 +1126,7 @@ * @version 1.0 */ @Transactional(rollbackFor = Exception.class) - public void saveOutStockItem(List<TaskItem> taskItems, AsnOrderItem orderItem, WaveItem waveItem, Long loginUserId) throws Exception { + public void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, Long loginUserId) throws Exception { Stock stock = new Stock(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null); if (StringUtils.isBlank(ruleCode)) { @@ -1141,7 +1142,7 @@ .setMemo("搴撳瓨鍑哄簱锛屾棤鍗曟嵁淇℃伅锛侊紒") .setType(OrderType.ORDER_OUT.type); } else if (!Objects.isNull(orderItem) && StringUtils.isNotBlank(orderItem.getId() + "")) { - WkOrder wkOrder = asnOrderService.getById(orderItem.getAsnId()); + WkOrder wkOrder = asnOrderService.getById(orderItem.getOrderId()); stock.setWkType(Short.parseShort(wkOrder.getWkType())) .setType(OrderType.ORDER_OUT.type); } else { -- Gitblit v1.9.1