From 6721cc29306aa5f8b2308bf40beb3c9c50abc27f Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 16:34:23 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 98ddf08..893c0c6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -1,16 +1,21 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.generator.config.IFileCreate;
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.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +24,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -40,6 +42,12 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private WaveOrderRelaService waveOrderRelaService;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private BasContainerServiceImpl basContainerService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -120,17 +128,17 @@
if (Cools.isEmpty(waveOrderRelas)) {
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
- List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
+ Set<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
ArrayList<WkOrderItem> list = new ArrayList<>();
List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
for (WkOrder wkOrder : wkOrderList) {
- WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ List<WkOrderItem> orderItem = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, wkOrder.getId())
.eq(StringUtils.isNotEmpty(taskItem.getMatnrCode()), WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
+// .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
);
if (null != orderItem) {
- list.add(orderItem);
+ list.addAll(orderItem);
}
}
containerWaveDto.setWkOrderItems(list);
@@ -218,6 +226,71 @@
return R.ok();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @Synchronized
+ public R callForEmptyContainers(CallForEmptyContainersParam containerWaveParam, Long loginUserId) {
+ // 鍙傛暟鏍￠獙
+ if (Objects.isNull(containerWaveParam) || StringUtils.isEmpty(containerWaveParam.getStaNo())) {
+ throw new CoolException("鍙傛暟閿欒锛岀珯鐐瑰彿涓嶈兘涓虹┖");
+ }
+ // 1. 绔欑偣淇℃伅鍒ゆ柇 - 缁堢偣
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, containerWaveParam.getStaNo())
+ .orderByDesc(BasStation::getId)
+ .last("LIMIT 1"), false);
+
+ if (Objects.isNull(basStation)) {
+ throw new CoolException(containerWaveParam.getStaNo() + "绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ if (!basStation.getUseStatus().equals("O")) {
+ throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
+ }
+
+ List<Long> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), Long.class);
+ if (Cools.isEmpty(areaList)){
+ throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
+ }
+
+ BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
+ .in(BasContainer::getContainerType, containerWaveParam.getType(), false));
+ if (Cools.isEmpty(basContainer)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧瀹瑰櫒瑙勫垯");
+ }
+ String barcodeType = "barcode REGEXP "+basContainer.getCodeType();
+ //瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .apply(barcodeType)
+ .eq(Loc::getDeleted, 0)
+ .eq(Loc::getStatus, 1)
+ .in(Loc::getAreaId, areaList)
+ .eq(Loc::getUseStatus, "O")
+ .orderByDesc(Loc::getId)
+ .last("LIMIT 1"),
+ false);
+
+ if (Cools.isEmpty(loc)){
+ throw new CoolException("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勬墭鐩�");
+ }
+// if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
+// //鍏夌數绔欑偣锛�
+// Long area = basStation.getArea();
+// //鏄惁闇�瑕佽浆闈炲厜鐢电珯鐐�
+// //绔嬪簱鍑哄簱==銆嬬粨鏉�
+// //AGV==銆嬬珛搴�==銆嬬粨鏉�
+// } else {
+// //闈炲厜鐢电珯鐐�
+// //鏄惁闇�瑕佽浆鍏夌數绔欑偣
+// //AGV==銆嬬粨鏉�
+// //绔嬪簱鍑哄簱==銆婣GV==銆嬬粨鏉�
+//
+// }
+
+ return R.ok().add(loc);
+ }
+
+
+
private Boolean checkWaveComplete(TaskItem taskItem) {
Wave wave = waveService.getById(taskItem.getSourceId());
--
Gitblit v1.9.1