From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 0e1e7da..1cecd7f 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
@@ -67,8 +67,6 @@
@Autowired
private OutStockItemService outStockItemService;
@Autowired
- private OutStockService outStockService;
- @Autowired
private WaveRuleService waveRuleService;
@Autowired
private LocItemService locItemService;
@@ -78,6 +76,8 @@
private LocService locService;
@Autowired
private WaveOrderRelaServiceImpl waveOrderRelaService;
+ @Autowired
+ private AsnOrderService asnOrderService;
/**
@@ -631,7 +631,7 @@
return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
}).reversed()).collect(Collectors.toList());
- WkOrder wkOrder = outStockService.getById(outId);
+ WkOrder wkOrder = this.getById(outId);
if (Cools.isEmpty(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -704,9 +704,17 @@
.setSourceId(outId)
.setSiteNo(param.getSiteNo());
//澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
- Short type = wkOrder.getType().equals(OrderType.ORDER_PRE.type) || wkOrder.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)
- ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
- :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
+ Short type = null;
+ switch (wkOrder.getType()) {
+ case "pre":
+ type = TaskResouceType.TASK_RESOUCE_STOCK_UP.val;
+ break;
+ case "preNot":
+ type = TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val;
+ break;
+ default:
+ type = TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
+ }
try {
//鐢熸垚鍑哄簱浠诲姟
locItemService.generateTask(type, taskParams, loginUserId);
@@ -719,7 +727,7 @@
Double sum = itemList.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
//鏇存柊鍑哄簱鍗曟槑缁嗗強涓诲崟
- WkOrder outOrder = outStockService.getById(outId);
+ WkOrder outOrder = this.getById(outId);
if (Objects.isNull(outOrder)) {
throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -727,7 +735,7 @@
outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);
- if (!outStockService.updateById(outOrder)) {
+ if (!this.updateById(outOrder)) {
throw new CoolException("鍑哄簱鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
@@ -870,6 +878,15 @@
}
private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule,List<Long> orderItemIdList) {
+ WkOrder wkOrder = asnOrderService.getById(orderId);
+ if (Cools.isEmpty(wkOrder)) {
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鍗曟嵁锛屽崟鍙稩D锛�"+orderId);
+ }
+ boolean sign = false;
+ if (wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type)
+ || wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type)){
+ sign = true;
+ }
List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.in(WkOrderItem::getId, orderItemIdList).eq(WkOrderItem::getOrderId, orderId));
List<OrderOutItemDto> list = new ArrayList<>();
@@ -890,6 +907,11 @@
locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
}
for (LocItem locItem : locItems) {
+ if (sign){
+ if (locItem.getType().equals(OrderType.ORDER_PRE.type) || locItem.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)) {
+ continue;
+ }
+ }
Loc loc = locService.getById(locItem.getLocId());
List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
if (issued.doubleValue() > 0) {
--
Gitblit v1.9.1