From 38c682e2296f560f7fd7ebae9064b7d09d62a923 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 05 十一月 2025 20:44:28 +0800
Subject: [PATCH] 临时盘点功能 优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 4231b53..1409e78 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
@@ -11,17 +11,18 @@
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.entity.FieldsItem;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import lombok.Synchronized;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -39,6 +40,8 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private WaveOrderRelaService waveOrderRelaService;
+ @Autowired
+ private FieldsItemService fieldsItemService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -119,20 +122,17 @@
if (Cools.isEmpty(waveOrderRelas)) {
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
- List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
+ Set<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
ArrayList<WkOrderItem> list = new ArrayList<>();
List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
for (WkOrder wkOrder : wkOrderList) {
- WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ List<WkOrderItem> orderItem = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, wkOrder.getId())
- .eq(WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(WkOrderItem::getSplrBatch, taskItem.getBatch())
- );
+ .eq(StringUtils.isNotEmpty(taskItem.getMatnrCode()), WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
+ .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch()));
if (null != orderItem) {
- list.add(orderItem);
+ list.addAll(orderItem);
}
-
-
}
containerWaveDto.setWkOrderItems(list);
containerWaveDtos.add(containerWaveDto);
@@ -141,6 +141,12 @@
return R.ok(containerWaveDtos);
}
+ /**
+ * @author Ryan
+ * @date 2025/11/5
+ * @description: 娉㈡鎷ｈ揣
+ * @version 1.0
+ */
@Override
@Transactional(rollbackFor = Exception.class)
@Synchronized
@@ -182,6 +188,15 @@
if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
+
+ if (!Objects.isNull(oldOrderItem.getFieldsIndex())) {
+ throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
+ }
+ //Fix 杩欓噷鍙拡瀵瑰笇鏃ラ」鐩殑绁ㄥ彿鍔熻兘锛岀エ鍙峰拰uuid涓轰竴瀵逛竴鐨勬儏鍐碉紝涓嶄細鍑虹幇閲嶅鐨勬儏鍐�
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, oldOrderItem.getFieldsIndex()).last("limit 1"));
+ if (!Objects.isNull(fieldsItem)) {
+ orderItem.setFieldsIndex(fieldsItem.getUuid());
+ }
orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
if (!asnOrderItemService.updateById(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触");
--
Gitblit v1.9.1