From 91db2ae52ed12aa27866af65f71d5433a5093a13 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 17 三月 2026 11:17:59 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 ceb34f3..85fdb25 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
@@ -78,6 +78,8 @@
private LocService locService;
@Autowired
private WaveOrderRelaServiceImpl waveOrderRelaService;
+ @Autowired
+ private AsnOrderService asnOrderService;
/**
@@ -704,9 +706,17 @@
.setSourceId(outId)
.setSiteNo(param.getSiteNo());
//澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
- Short type = wkOrder.getType().equals(OrderType.ORDER_Pre.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);
@@ -870,6 +880,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 +909,11 @@
locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
}
for (LocItem locItem : locItems) {
+ if (sign){
+ if (locItem.getType().equals(OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type) || locItem.getType().equals(OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.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