From 1aa6e5963e5c4eca765924e9b2b094e6e2c525b3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 15:38:33 +0800
Subject: [PATCH] 添加出库单据任务取消功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 116 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 27 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 990e9ac..5e2785c 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
@@ -1,7 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
@@ -421,26 +420,23 @@
throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
}
List<OrderOutItemDto> locItems = null;
- if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
- locItems = efficiencyFirst(param.getOrderId());
- } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
-
- }
+ locItems = getOutOrderList(param.getOrderId(), waveRule);
return R.ok(locItems);
}
/**
* 鐢熸垚鍑哄簱浠诲姟
+ *
* @param params
+ * @param outId
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R genOutStockTask(List<OutStockToTaskParams> params, Long loginUserId) {
+ public R genOutStockTask(List<OutStockToTaskParams> params, Long loginUserId, Long outId) {
if (params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
//浼樺厛鐢熸垚娴呭簱浣嶄换鍔�
List<OutStockToTaskParams> Items = params.stream().sorted(Comparator.comparing(OutStockToTaskParams::getLocCode).thenComparing(item -> {
return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
@@ -454,30 +450,71 @@
if (!Objects.isNull(loc)) {
List<LocItem> locItems = new ArrayList<>();
LocItem locItem = locItemService.getById(param.getId());
- locItem.setOutQty(param.getOutQty()).setBatch(param.getBatch());
+
+ AsnOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, outId)
+ .eq(StringUtils.isNotBlank(locItem.getBatch()), AsnOrderItem::getSplrBatch, locItem.getBatch())
+ .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), AsnOrderItem::getFieldsIndex, locItem.getFieldsIndex())
+ .eq(AsnOrderItem::getMatnrId, locItem.getMatnrId()));
+
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ locItem.setOutQty(param.getOutQty())
+ .setBatch(param.getBatch())
+ .setSourceId(outId)
+ .setSourceCode(orderItem.getAsnCode())
+ .setSource(orderItem.getId());
locItems.add(locItem);
LocToTaskParams taskParams = new LocToTaskParams();
- taskParams.setType(Constants.TASK_TYPE_OUT_STOCK)
+ taskParams.setType(Constants.TASK_TYPE_ORDER_OUT_STOCK)
.setOrgLoc(loc.getCode())
.setItems(locItems)
+ .setSourceId(outId)
.setSiteNo(param.getSiteNo());
try {
+ //鐢熸垚鍑哄簱浠诲姟
locItemService.generateTask(taskParams, loginUserId);
} catch (Exception e) {
logger.error("UNK", e);
throw new CoolException(e.getMessage());
}
+
+
+ Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 10000) / 10000.0;
+
+ orderItem.setUpdateBy(loginUserId).setUpdateTime(new Date()).setWorkQty(workQty);
+
+ if (!outStockItemService.updateById(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
+ }
}
+ }
+
+ Double sum = Items.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
+ //鏇存柊鍑哄簱鍗曟槑缁嗗強涓诲崟
+ AsnOrder outOrder = outStockService.getById(outId);
+ if (Objects.isNull(outOrder)) {
+ throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ Double workQty = Math.round((outOrder.getWorkQty() + sum) * 10000) / 10000.0;
+
+ outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);
+
+ if (!outStockService.updateById(outOrder)) {
+ throw new CoolException("鍑哄簱鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
return R.ok();
}
+
private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem) {
- QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
- locItemQueryWrapper.eq("matnr_code", asnOrderItem.getMatnrCode());
- locItemQueryWrapper.eq("batch", asnOrderItem.getSplrBatch());
+ LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
+ locItemQueryWrapper.eq(LocItem::getMatnrCode, asnOrderItem.getMatnrCode());
+ locItemQueryWrapper.eq(LocItem::getBatch, asnOrderItem.getSplrBatch());
String applySql = String.format(
"EXISTS (SELECT 1 FROM man_loc ml " +
"WHERE ml.use_status = '%s'" +
@@ -487,18 +524,34 @@
);
locItemQueryWrapper.apply(applySql);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
- locItems.sort((s1, s2) -> LocUtils.isShallowLoc(s1.getLocCode()) ? -1 : 0);
+ locItems.sort(Comparator
+ .comparing((LocItem item) -> !LocUtils.isShallowLoc(item.getLocCode()))
+ );
return locItems;
}
- private List<OrderOutItemDto> efficiencyFirst(Long orderId) {
+ private List<LocItem> getFirstInFirstOutItemList(AsnOrderItem asnOrderItem) {
+ LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
+ locItemQueryWrapper.eq(LocItem::getMatnrCode, asnOrderItem.getMatnrCode());
+ locItemQueryWrapper.eq(LocItem::getBatch, asnOrderItem.getSplrBatch());
+ locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
+ String applySql = String.format(
+ "EXISTS (SELECT 1 FROM man_loc ml " +
+ "WHERE ml.use_status = '%s'" +
+ "AND ml.id = man_loc_item.loc_id " +
+ ")",
+ LocStsType.LOC_STS_TYPE_F.type
+ );
+ locItemQueryWrapper.apply(applySql);
+ List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
+ return locItems;
+ }
+
+ private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) {
List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, orderId)
);
-
List<OrderOutItemDto> list = new ArrayList<>();
-
- Set<String> exist = new HashSet<>();
Set<ExistDto> existDtos = new HashSet<>();
for (AsnOrderItem asnOrderItem : asnOrderItems) {
@@ -509,7 +562,13 @@
continue;
}
List<LocItem> locItems = null;
- locItems = getEfficiencyFirstItemList(asnOrderItem);
+ if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
+ locItems = getEfficiencyFirstItemList(asnOrderItem);
+ } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
+ locItems = getFirstInFirstOutItemList(asnOrderItem);
+ } else {
+ locItems = getFirstInFirstOutItemList(asnOrderItem);
+ }
for (LocItem locItem : locItems) {
Loc loc = locService.getById(locItem.getLocId());
List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
@@ -520,22 +579,25 @@
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<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);
list.add(orderOutItemDto);
--
Gitblit v1.9.1