From 69f0cb595ddd69c8870fe83b1d55d16a21bdc0ad Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 09:10:16 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index dfdfba0..33f3510 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -6,10 +6,12 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.dto.ExistDto;
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
+import com.vincent.rsf.server.manager.controller.dto.OrderOutItemPdaDto;
import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
@@ -382,11 +384,12 @@
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
- }
- orders.setCode(ruleCode)
+// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
+// if (StringUtils.isBlank(ruleCode)) {
+// throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
+// }
+ orders.setCode(orders.getPoCode())
+ .setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
.setType(OrderType.ORDER_OUT.type)
.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.setUpdateBy(loginUserId)
@@ -478,7 +481,15 @@
List<Long> itemIds = new ArrayList<>();
itemIds.add(orderItemId);
locItems = getOutOrderList(param.getOrderId(), waveRule,itemIds);
- return R.ok(locItems);
+ List<OrderOutItemPdaDto> locItemList = new ArrayList<>();
+ for (OrderOutItemDto locItem : locItems) {
+ for (LocItem locItem1 : locItem.getLocItemList()) {
+ OrderOutItemPdaDto orderOutItemPdaDto = new OrderOutItemPdaDto();
+ orderOutItemPdaDto.setLocItem(locItem1);
+ locItemList.add(orderOutItemPdaDto);
+ }
+ }
+ return R.ok(locItemList);
}
@Override
@@ -708,7 +719,8 @@
locItem.setOutQty(issued.doubleValue() >= locItem.getAnfme() ? locItem.getAnfme() : issued.doubleValue());
locItem.setBarcode(loc.getBarcode());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
- orderOutItemDto.setLocItem(locItem);
+// orderOutItemDto.setLocItem(locItem);
+ orderOutItemDto.getLocItemList().add(locItem);
List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getChannel, loc.getChannel())
@@ -746,7 +758,8 @@
.setUnit(wkOrderItem.getStockUnit())
.setBatch(wkOrderItem.getSplrBatch());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
- orderOutItemDto.setLocItem(locItem);
+// orderOutItemDto.setLocItem(locItem);
+ orderOutItemDto.getLocItemList().add(locItem);
list.add(orderOutItemDto);
}
}
@@ -784,7 +797,8 @@
locItem.setOutQty(issued.doubleValue() >= locItem.getAnfme() ? locItem.getAnfme() : issued.doubleValue());
locItem.setBarcode(loc.getBarcode());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
- orderOutItemDto.setLocItem(locItem);
+// orderOutItemDto.setLocItem(locItem);
+ orderOutItemDto.getLocItemList().add(locItem);
List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getChannel, loc.getChannel())
@@ -822,7 +836,8 @@
.setUnit(wkOrderItem.getStockUnit())
.setBatch(wkOrderItem.getSplrBatch());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
- orderOutItemDto.setLocItem(locItem);
+// orderOutItemDto.setLocItem(locItem);
+ orderOutItemDto.getLocItemList().add(locItem);
list.add(orderOutItemDto);
}
}
--
Gitblit v1.9.1