From 2938aa734a2cf0baf93fdced92ea21e37f187365 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:05:39 +0800
Subject: [PATCH] 出库单下发执行生成任务明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 168 insertions(+), 5 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 1b104a7..990e9ac 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,30 +1,40 @@
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;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.dto.ExistDto;
+import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.POExceStatus;
-import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+
+import com.vincent.rsf.server.manager.enums.WaveRuleType;
/**
* @author Ryan
@@ -35,6 +45,9 @@
*/
@Service("outStockServiceImpl")
public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements OutStockService {
+
+ public Logger logger = LoggerFactory.getLogger(this.getClass());
+
@Autowired
private AsnOrderItemService asnOrderItemService;
@@ -56,6 +69,14 @@
private OutStockItemService outStockItemService;
@Autowired
private OutStockService outStockService;
+ @Autowired
+ private WaveRuleService waveRuleService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private LocService locService;
/**
@@ -98,7 +119,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelOutOrder(String id) {
- //TODO 鍑哄簱鍗曞彇娑堟祦绋嬶紝QMS锛堝崟鎹彇娑堬級->DO鍗�->鍑哄簱鍗�->娉㈡->鍒ゆ柇鏄惁鍏ㄥ崟鎹�->鍏ㄥ崟鎹笅鍙戝彇娑堜换鍔¤嚦WCS,闈炲叏鍗曟暟鎹彇娑堝垹闄ゆ祦绋嬫墍鏈夊叧鑱旀暟鎹�
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -357,6 +377,7 @@
}
return R.ok();
}
+
/**
* @param
* @return
@@ -387,6 +408,148 @@
return R.ok();
}
+ @Override
+ public R getOrderOutTaskItem(OrderOutTaskParam param) {
+ if (Cools.isEmpty(param.getWaveId())) {
+ throw new CoolException("绛栫暐鍙傛暟涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderId())) {
+ throw new CoolException("鍗曟嵁id涓虹┖");
+ }
+ WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>().eq(WaveRule::getId, param.getWaveId()));
+ if (Cools.isEmpty(waveRule)) {
+ 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())) {
+
+ }
+ return R.ok(locItems);
+ }
+
+ /**
+ * 鐢熸垚鍑哄簱浠诲姟
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R genOutStockTask(List<OutStockToTaskParams> params, Long loginUserId) {
+ 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;
+ }).reversed()).collect(Collectors.toList());
+
+ for (OutStockToTaskParams param : Items) {
+ if (Objects.isNull(param)) {
+ continue;
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, param.getBarcode()));
+ if (!Objects.isNull(loc)) {
+ List<LocItem> locItems = new ArrayList<>();
+ LocItem locItem = locItemService.getById(param.getId());
+ locItem.setOutQty(param.getOutQty()).setBatch(param.getBatch());
+ locItems.add(locItem);
+
+ LocToTaskParams taskParams = new LocToTaskParams();
+ taskParams.setType(Constants.TASK_TYPE_OUT_STOCK)
+ .setOrgLoc(loc.getCode())
+ .setItems(locItems)
+ .setSiteNo(param.getSiteNo());
+ try {
+ locItemService.generateTask(taskParams, loginUserId);
+ } catch (Exception e) {
+ logger.error("UNK", e);
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
+
+ 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());
+ 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);
+ locItems.sort((s1, s2) -> LocUtils.isShallowLoc(s1.getLocCode()) ? -1 : 0);
+ return locItems;
+ }
+
+ private List<OrderOutItemDto> efficiencyFirst(Long orderId) {
+ 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) {
+ BigDecimal issued = new BigDecimal(asnOrderItem.getAnfme().toString())
+ .subtract(new BigDecimal(asnOrderItem.getWorkQty().toString())
+ );
+ if (issued.doubleValue() <= 0) {
+ continue;
+ }
+ List<LocItem> locItems = null;
+ locItems = getEfficiencyFirstItemList(asnOrderItem);
+ 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()) {
+ 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);
+
+ issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
+ }
+ }
+
+ }
+ }
+
+ return list;
+
+ }
+
/**
* @param
* @param wave
--
Gitblit v1.9.1