From 4d98ae91ea5a7edeaf2cc4f168ca7d87d1d44994 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 30 一月 2026 15:37:29 +0800
Subject: [PATCH] #备货+订单编辑bug修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 1 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 2539e2e..fdc69e0 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
@@ -454,6 +454,33 @@
return R.ok(locItems);
}
+ @Override
+ public R getOrderOutTaskItem(OrderOutTaskParam param,Long orderItemId) {
+
+ OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
+ orderOutTaskParam.setWaveId(param.getWaveId());
+
+ if (Cools.isEmpty(param.getWaveId())) {
+ throw new CoolException("绛栫暐鍙傛暟涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderId())) {
+ throw new CoolException("鍗曟嵁ID涓虹┖");
+ }
+ WkOrderItem byId = asnOrderItemService.getById(orderItemId);
+ param.setOrderId(byId.getOrderId());
+
+ WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>()
+ .eq(WaveRule::getId, param.getWaveId()));
+ if (Cools.isEmpty(waveRule)) {
+ throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
+ }
+ List<OrderOutItemDto> locItems = null;
+ List<Long> itemIds = new ArrayList<>();
+ itemIds.add(orderItemId);
+ locItems = getOutOrderList(param.getOrderId(), waveRule,itemIds);
+ return R.ok(locItems);
+ }
+
/**
* 鐢熸垚鍑哄簱浠诲姟
*
@@ -473,6 +500,11 @@
.thenComparing(item -> {
return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
}).reversed()).collect(Collectors.toList());
+
+ WkOrder wkOrder = outStockService.getById(outId);
+ if (Cools.isEmpty(wkOrder)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
for (OutStockToTaskParams param : Items) {
if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) {
@@ -506,9 +538,13 @@
.setItems(locItems)
.setSourceId(outId)
.setSiteNo(param.getSiteNo());
+ //澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
+ Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
+ ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
+ :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
try {
//鐢熸垚鍑哄簱浠诲姟
- locItemService.generateTask(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val, taskParams, loginUserId);
+ locItemService.generateTask(type, taskParams, loginUserId);
} catch (Exception e) {
logger.error("UNK", e);
throw new CoolException(e.getMessage());
@@ -675,6 +711,82 @@
}
+ private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule,List<Long> orderItemIdList) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getId, orderItemIdList).eq(WkOrderItem::getOrderId, orderId));
+ List<OrderOutItemDto> list = new ArrayList<>();
+ Set<ExistDto> existDtos = new HashSet<>();
+ for (WkOrderItem wkOrderItem : wkOrderItems) {
+ BigDecimal issued = new BigDecimal(wkOrderItem.getAnfme().toString())
+ .subtract(new BigDecimal(wkOrderItem.getWorkQty().toString())
+ );
+ if (issued.doubleValue() <= 0) {
+ continue;
+ }
+ List<LocItem> locItems = new ArrayList<>();
+ if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
+ locItems = LocManageUtil.getEfficiencyFirstItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ } else {
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
+ }
+ for (LocItem locItem : locItems) {
+ Loc loc = locService.getById(locItem.getLocId());
+ List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
+ if (issued.doubleValue() > 0) {
+ ExistDto existDto = new ExistDto().setBatch(locItem.getBatch()).setMatnr(locItem.getMatnrCode()).setLocNo(locItem.getLocCode());
+ if (existDtos.add(existDto)) {
+ locItem.setOutQty(issued.doubleValue() >= locItem.getAnfme() ? locItem.getAnfme() : issued.doubleValue());
+ locItem.setBarcode(loc.getBarcode());
+ OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
+ orderOutItemDto.setLocItem(locItem);
+
+ List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getType, issued.doubleValue() >= locItem.getAnfme() && itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
+ );
+
+ if (!deviceSites.isEmpty()) {
+ List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
+ for (DeviceSite sta : deviceSites) {
+ OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();
+ staListDto.setStaNo(sta.getSite());
+ staListDto.setStaName(sta.getSite());
+ maps.add(staListDto);
+ }
+ orderOutItemDto.setStaNos(maps);
+ //榛樿鑾峰彇绗竴绔欑偣
+ DeviceSite deviceSite = deviceSites.stream().findFirst().get();
+ orderOutItemDto.setSiteNo(deviceSite.getSite());
+ }
+
+ list.add(orderOutItemDto);
+
+ issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
+ }
+ }
+ }
+ if (issued.doubleValue() > 0) {
+ LocItem locItem = new LocItem()
+ .setId(new Random().nextLong())
+ .setMatnrCode(wkOrderItem.getMatnrCode())
+ .setMaktx(wkOrderItem.getMaktx())
+ .setAnfme(0.00)
+ .setWorkQty(issued.doubleValue())
+ .setOutQty(issued.doubleValue())
+ .setUnit(wkOrderItem.getStockUnit())
+ .setBatch(wkOrderItem.getSplrBatch());
+ OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
+ orderOutItemDto.setLocItem(locItem);
+ list.add(orderOutItemDto);
+ }
+ }
+
+ return list;
+
+ }
+
/**
* @param
* @param wave
--
Gitblit v1.9.1