From e711c834aec2293c53b07efe53e81e3573c289b6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 01 四月 2026 11:42:44 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 46 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 15265c3..f5b76c6 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
@@ -19,6 +19,7 @@
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
+import com.vincent.rsf.server.manager.utils.WarehouseLocationRetrievalUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -67,8 +68,6 @@
@Autowired
private OutStockItemService outStockItemService;
@Autowired
- private OutStockService outStockService;
- @Autowired
private WaveRuleService waveRuleService;
@Autowired
private LocItemService locItemService;
@@ -78,6 +77,10 @@
private LocService locService;
@Autowired
private WaveOrderRelaServiceImpl waveOrderRelaService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private BasStationServiceImpl basStationService;
/**
@@ -356,11 +359,10 @@
}
for (WkOrder order : orders) {
Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 10000) / 10000.0;
- if (!this.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getWaveId, wave.getId())
- .set(WkOrder::getWorkQty, wkQty)
- .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
- .eq(WkOrder::getId, order.getId()))) {
+ order.setWaveId(wave.getId())
+ .setWorkQty(wkQty)
+ .setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val);
+ if (!this.updateById(order)) {
throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
}
}
@@ -455,11 +457,10 @@
}
for (WkOrder order : orders) {
Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 10000) / 10000.0;
- if (!this.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getWaveId, wave.getId())
- .set(WkOrder::getWorkQty, wkQty)
- .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
- .eq(WkOrder::getId, order.getId()))) {
+ order.setWaveId(wave.getId())
+ .setWorkQty(wkQty)
+ .setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val);
+ if (!this.updateById(order)) {
throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
}
}
@@ -631,7 +632,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("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -727,7 +728,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("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -735,7 +736,7 @@
outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);
- if (!outStockService.updateById(outOrder)) {
+ if (!this.updateById(outOrder)) {
throw new CoolException("鍑哄簱鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
@@ -749,12 +750,13 @@
*/
@Override
public R getSiteNos() {
- List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_MERGE_OUT.type,
- TaskType.TASK_TYPE_OUT.type,
- TaskType.TASK_TYPE_MERGE_OUT.type,
- TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
- List<DeviceSite> sites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, list).groupBy(DeviceSite::getSite));
- return R.ok(sites);
+// List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_MERGE_OUT.type,
+// TaskType.TASK_TYPE_OUT.type,
+// TaskType.TASK_TYPE_MERGE_OUT.type,
+// TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);sites
+// List<DeviceSite> = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, list).groupBy(DeviceSite::getSite));
+ List<BasStation> basStationList = basStationService.list(new LambdaQueryWrapper<BasStation>().eq(BasStation::getOutAble, true));
+ return R.ok(basStationList);
}
@Override
@@ -830,24 +832,18 @@
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
// orderOutItemDto.setLocItem(locItem);
orderOutItemDto.getLocItemList().add(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<String> outboundSiteByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type.toString() : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.toString());
+ if (!outboundSiteByReservoirAreaAndContainer.isEmpty()) {
List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
- for (DeviceSite sta : deviceSites) {
+ for (String staNo : outboundSiteByReservoirAreaAndContainer) {
OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();
- staListDto.setStaNo(sta.getSite());
- staListDto.setStaName(sta.getSite());
+ staListDto.setStaNo(staNo);
+ staListDto.setStaName(staNo);
maps.add(staListDto);
}
orderOutItemDto.setStaNos(maps);
//榛樿鑾峰彇绗竴绔欑偣
- DeviceSite deviceSite = deviceSites.stream().findFirst().get();
- orderOutItemDto.setSiteNo(deviceSite.getSite());
+ orderOutItemDto.setSiteNo(outboundSiteByReservoirAreaAndContainer.get(0));
}
list.add(orderOutItemDto);
@@ -878,6 +874,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<>();
@@ -898,6 +903,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) {
@@ -906,26 +916,19 @@
locItem.setOutQty(issued.doubleValue() >= locItem.getAnfme() ? locItem.getAnfme() : issued.doubleValue());
locItem.setBarcode(loc.getBarcode());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
-// orderOutItemDto.setLocItem(locItem);
orderOutItemDto.getLocItemList().add(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<String> outboundSiteByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutboundSiteByReservoirAreaAndContainer(loc.getAreaId(), loc.getBarcode(),itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
+ if (!outboundSiteByReservoirAreaAndContainer.isEmpty()) {
List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
- for (DeviceSite sta : deviceSites) {
+ for (String staNo : outboundSiteByReservoirAreaAndContainer) {
OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();
- staListDto.setStaNo(sta.getSite());
- staListDto.setStaName(sta.getSite());
+ staListDto.setStaNo(staNo);
+ staListDto.setStaName(staNo);
maps.add(staListDto);
}
orderOutItemDto.setStaNos(maps);
//榛樿鑾峰彇绗竴绔欑偣
- DeviceSite deviceSite = deviceSites.stream().findFirst().get();
- orderOutItemDto.setSiteNo(deviceSite.getSite());
+ orderOutItemDto.setSiteNo(outboundSiteByReservoirAreaAndContainer.get(0));
}
list.add(orderOutItemDto);
--
Gitblit v1.9.1