From af1ee01622373808c0c8a82f3c4e292fb5d917ba Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 11:16:16 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 138 insertions(+), 16 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 dd29375..594cd86 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
@@ -89,8 +89,8 @@
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
- item.put("asnId", orders.getId());
- item.put("asnCode", orders.getCode());
+ item.put("orderId", orders.getId());
+ item.put("orderCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
@@ -99,7 +99,7 @@
}
});
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
+ .eq(WkOrderItem::getOrderId, params.getOrders().getId()));
Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
@@ -129,7 +129,7 @@
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
}
- List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id));
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id));
if (!orderItems.isEmpty()) {
for (WkOrderItem orderItem : orderItems) {
if (!Objects.isNull(orderItem.getPoDetlId())) {
@@ -155,9 +155,7 @@
if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
- if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id))) {
- throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
+ outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id));
return R.ok("鎿嶄綔鎴愬姛");
}
@@ -221,8 +219,8 @@
.setFieldsIndex(item.getFieldsIndex())
.setAnfme(item.getAnfme())
.setWorkQty(0.0)
- .setAsnId(order.getId())
- .setAsnCode(order.getCode())
+ .setOrderId(order.getId())
+ .setOrderCode(order.getCode())
.setStockUnit(item.getUnit())
.setPurUnit(item.getUnit())
.setPlatWorkCode(item.getPlatWorkCode())
@@ -306,7 +304,7 @@
List<Long> list = orders.stream().map(WkOrder::getId).collect(Collectors.toList());
List<WkOrderItem> orderItems = asnOrderItemService
.list(new LambdaQueryWrapper<WkOrderItem>()
- .in(WkOrderItem::getAsnId, list).apply("anfme > work_qty"));
+ .in(WkOrderItem::getOrderId, list).apply("anfme > work_qty"));
if (orderItems.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -338,7 +336,7 @@
items.forEach(orderItem -> {
WaveOrderRela orderRela = new WaveOrderRela();
orderRela.setId(null)
- .setOrderId(orderItem.getAsnId())
+ .setOrderId(orderItem.getOrderId())
.setOrderItemId(orderItem.getId())
.setWaveId(wave.getId())
.setWaveItemId(item.getId());
@@ -456,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);
+ }
+
/**
* 鐢熸垚鍑哄簱浠诲姟
*
@@ -486,7 +511,7 @@
LocItem locItem = locItemService.getById(param.getId());
WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getAsnId, outId)
+ .eq(WkOrderItem::getOrderId, outId)
.eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
.eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
.eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
@@ -498,7 +523,7 @@
locItem.setOutQty(param.getOutQty())
.setBatch(param.getBatch())
.setSourceId(outId)
- .setSourceCode(orderItem.getAsnCode())
+ .setSourceCode(orderItem.getOrderCode())
.setSource(orderItem.getId());
locItems.add(locItem);
@@ -562,7 +587,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelOutOrderByItems(List<WkOrderItem> orderItems) {
- Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getAsnId));
+ Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId));
for (Long key : listMap.keySet()) {
WkOrder order = this.getById(key);
if (Objects.isNull(order)) {
@@ -593,7 +618,7 @@
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getAsnId, key))) {
+ .eq(WkOrderItem::getOrderId, key))) {
throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
@@ -603,7 +628,83 @@
private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) {
List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getAsnId, orderId));
+ .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;
+
+ }
+
+ 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) {
@@ -730,4 +831,25 @@
return waveItems;
}
+
+
+ /**
+ * @param id
+ * @return
+ * @author Ryan
+ * @description 瀹屾垚鍑哄簱鍗�
+ * @time 2025/4/25 10:07
+ */
+ @Override
+ public R completeOutOrderById(Long id) {
+ WkOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ return R.error("鍑哄簱鍗曚笉瀛樺湪锛侊紒");
+ }
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!this.updateById(order)) {
+ throw new CoolException("瀹屾垚鍑哄簱鍗曞け璐ワ紒锛�");
+ }
+ return R.ok("瀹屾垚鍑哄簱鍗曟垚鍔燂紒锛�");
+ }
}
--
Gitblit v1.9.1