From 744cd972c118953540b19aa9f5ca97dd40e68b6d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 17 三月 2026 12:50:43 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 174a19a..26d7550 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;
/**
@@ -276,7 +278,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R generateWavesOrderAuto(GenWaveParams params,String stationId) {
+ public R generateWavesOrderAuto(GenWaveParams params,String stationId,String locCode) {
if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -320,6 +322,7 @@
double sum1 = waveItems.stream().mapToDouble(WaveItem::getAnfme).sum();
wave.setAnfme(sum1).setGroupQty(waveItems.size());
wave.setStationId(stationId);
+ wave.setLocCode(locCode);
if (!waveService.saveOrUpdate(wave)) {
throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
@@ -703,9 +706,17 @@
.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;
+ 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);
@@ -869,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<>();
@@ -889,6 +909,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