From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 0cd9636..6b5d540 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -71,7 +71,7 @@
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
maps.keySet().forEach(key -> {
- AsnOrderItem orderItem = asnOrderItemService.getById(key);
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
if (Objects.isNull(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -120,13 +120,13 @@
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- ArrayList<AsnOrderItem> list = new ArrayList<>();
+ ArrayList<WkOrderItem> list = new ArrayList<>();
List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
for (WkOrder wkOrder : wkOrderList) {
- AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, wkOrder.getId())
- .eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
+ WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, wkOrder.getId())
+ .eq(WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
+ .eq(WkOrderItem::getSplrBatch, taskItem.getBatch())
);
if (null != orderItem){
list.add(orderItem);
@@ -134,7 +134,7 @@
}
- containerWaveDto.setAsnOrderItems(list);
+ containerWaveDto.setWkOrderItems(list);
containerWaveDtos.add(containerWaveDto);
}
@@ -158,17 +158,17 @@
for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
//鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
- double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
+ double sum = containerWaveDto.getWkOrderItems().stream().mapToDouble(WkOrderItem::getDemandQty).sum();
BigDecimal total = new BigDecimal(String.valueOf(sum));
BigDecimal anfme = new BigDecimal(containerWaveDto.getTaskItem().getAnfme().toString());
if (!anfme.equals(total)){
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
- for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
+ for (WkOrderItem oldOrderItem : containerWaveDto.getWkOrderItems()) {
if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
continue;
}
- AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
+ WkOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
if (num.compareTo(orderDemandQty) < 0){
@@ -227,8 +227,8 @@
return wkOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
- private Boolean checkOrderComplete(AsnOrderItem orderItem) {
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, orderItem.getAsnCode()));
- return asnOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ private Boolean checkOrderComplete(WkOrderItem orderItem) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnCode, orderItem.getAsnCode()));
+ return wkOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
}
--
Gitblit v1.9.1