From a76bde8ba1f9a35a0490b5ced3fd6a8ba084a712 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 13:09:06 +0800
Subject: [PATCH] 修改库口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 191 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 151 insertions(+), 40 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 c90f8a7..3b301d7 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.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -40,11 +42,14 @@
* @return
* @time 2025/3/7 08:02
*/
+@Slf4j
@Service("outStockServiceImpl")
public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements OutStockService {
public Logger logger = LoggerFactory.getLogger(this.getClass());
+ /** 鍑哄簱鍓╀綑閲忓宸細灏忎簬绛変簬姝ゅ�艰涓哄凡鍒嗛厤瀹岋紝閬垮厤娴偣璇樊浜х敓澶氫綑鈥滃簱瀛樹笉瓒斥�濊 */
+ private static final BigDecimal ISSUED_TOLERANCE = new BigDecimal("0.000001");
@Autowired
private AsnOrderItemService asnOrderItemService;
@@ -478,19 +483,98 @@
if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) {
continue;
}
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, param.getLocCode()).eq(Loc::getBarcode, param.getBarcode()));
+ // 淇锛氭瀯寤哄簱浣嶆煡璇㈡潯浠讹紝濡傛灉barcode涓虹┖锛屽彧鎸塴ocCode鏌ヨ
+ LambdaQueryWrapper<Loc> locQueryWrapper = new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, param.getLocCode());
+ if (StringUtils.isNotBlank(param.getBarcode())) {
+ locQueryWrapper.eq(Loc::getBarcode, param.getBarcode());
+ }
+ Loc loc = locService.getOne(locQueryWrapper);
if (!Objects.isNull(loc)) {
List<LocItem> locItems = new ArrayList<>();
LocItem locItem = locItemService.getById(param.getId());
+
+ if (Objects.isNull(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紝ID锛�" + param.getId());
+ }
- WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ // 淇锛氭瀯寤烘煡璇㈡潯浠讹紝鍏堟瀯寤哄熀纭�鏉′欢锛屽啀鏍规嵁鍊兼槸鍚︿负绌哄姩鎬佹坊鍔�
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰嶏紝濡傛灉娌℃湁鍒欎娇鐢ㄥ簱瀛樻壒娆″尮閰�
+ LambdaQueryWrapper<WkOrderItem> orderItemWrapper = new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, outId)
- .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
- .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
- .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
+ .eq(WkOrderItem::getMatnrId, locItem.getMatnrId());
+
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰�
+ if (StringUtils.isNotBlank(locItem.getSplrBatch())) {
+ orderItemWrapper.eq(WkOrderItem::getSplrBatch, locItem.getSplrBatch());
+ } else if (StringUtils.isNotBlank(locItem.getBatch())) {
+ // 濡傛灉LocItem鍙湁batch瀛楁锛屽皾璇曞悓鏃跺尮閰峎kOrderItem鐨刡atch鍜宻plrBatch瀛楁
+ // 鍥犱负鏌愪簺鎯呭喌涓婰ocItem鐨刡atch鍙兘瀵瑰簲WkOrderItem鐨剆plrBatch
+ orderItemWrapper.and(wrapper -> wrapper
+ .eq(WkOrderItem::getBatch, locItem.getBatch())
+ .or()
+ .eq(WkOrderItem::getSplrBatch, locItem.getBatch())
+ );
+ }
+
+ if (StringUtils.isNotBlank(locItem.getFieldsIndex())) {
+ orderItemWrapper.eq(WkOrderItem::getFieldsIndex, locItem.getFieldsIndex());
+ }
+ // 鍚屼竴鍑哄簱鍗曚笅鍚屼竴鐗╂枡鍙兘鏈夊鏉℃槑缁嗭紙濡傚琛屽悎骞讹級锛岀敤 list 鍙栦粛鏈夊墿浣欐暟閲忕殑绗竴鏉★紝閬垮厤 getOne 杩斿洖澶氭潯鎶� TooManyResultsException
+ List<WkOrderItem> orderItemCandidates = outStockItemService.list(orderItemWrapper);
+ WkOrderItem orderItem = orderItemCandidates.stream()
+ .filter(o -> o.getAnfme() != null && o.getWorkQty() != null && o.getAnfme().compareTo(o.getWorkQty()) > 0)
+ .findFirst()
+ .orElse(null);
+ // 濡傛灉鎵句笉鍒板崟鎹槑缁嗭紝涓擫ocItem鏉ヨ嚜搴撳瓨璋冩暣锛屽垯鑷姩鍒涘缓WkOrderItem
if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ // 妫�鏌ユ槸鍚︽槸搴撳瓨璋冩暣浜х敓鐨勫簱瀛�
+ if (locItem.getWkType() != null &&
+ locItem.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type))) {
+ // 鑾峰彇鍑哄簱鍗曚俊鎭�
+ WkOrder outOrder = outStockService.getById(outId);
+ if (Objects.isNull(outOrder)) {
+ throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ log.info("搴撳瓨璋冩暣浜х敓鐨勫簱瀛橈紝鑷姩鍒涘缓WkOrderItem - 鍑哄簱鍗旾D锛歿}锛岀墿鏂橧D锛歿}锛屾壒娆★細{}",
+ outId, locItem.getMatnrId(), locItem.getBatch());
+
+ // 鍒涘缓WkOrderItem
+ orderItem = new WkOrderItem();
+ orderItem.setOrderId(outId)
+ .setOrderCode(outOrder.getCode())
+ .setMatnrId(locItem.getMatnrId())
+ .setMatnrCode(locItem.getMatnrCode())
+ .setMaktx(locItem.getMaktx())
+ .setBatch(StringUtils.isNotBlank(param.getBatch()) ? param.getBatch() : locItem.getBatch())
+ .setSplrBatch(StringUtils.isNotBlank(locItem.getSplrBatch()) ? locItem.getSplrBatch() :
+ (StringUtils.isNotBlank(locItem.getBatch()) ? locItem.getBatch() : null))
+ .setFieldsIndex(locItem.getFieldsIndex())
+ .setAnfme(param.getOutQty())
+ .setWorkQty(0.0)
+ .setStockUnit(locItem.getUnit())
+ .setPurUnit(locItem.getUnit())
+ .setSpec(locItem.getSpec())
+ .setModel(locItem.getModel())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+
+ if (!outStockItemService.save(orderItem)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曟嵁鏄庣粏鍒涘缓澶辫触锛侊紒");
+ }
+
+ log.info("WkOrderItem鍒涘缓鎴愬姛 - ID锛歿}锛屽嚭搴撳崟ID锛歿}锛岀墿鏂橧D锛歿}",
+ orderItem.getId(), outId, locItem.getMatnrId());
+ } else {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛佸嚭搴撳崟ID锛�" + outId + "锛岀墿鏂橧D锛�" + locItem.getMatnrId() +
+ (StringUtils.isNotBlank(locItem.getSplrBatch()) ? "锛屼緵搴斿晢鎵规锛�" + locItem.getSplrBatch() :
+ StringUtils.isNotBlank(locItem.getBatch()) ? "锛屽簱瀛樻壒娆★細" + locItem.getBatch() : "") +
+ (StringUtils.isNotBlank(locItem.getFieldsIndex()) ? "锛屽瓧娈电储寮曪細" + locItem.getFieldsIndex() : ""));
+ }
}
locItem.setOutQty(param.getOutQty())
@@ -605,9 +689,8 @@
Set<ExistDto> existDtos = new HashSet<>();
for (WkOrderItem wkOrderItem : wkOrderItems) {
BigDecimal issued = new BigDecimal(wkOrderItem.getAnfme().toString())
- .subtract(new BigDecimal(wkOrderItem.getWorkQty().toString())
- );
- if (issued.doubleValue() <= 0) {
+ .subtract(new BigDecimal(wkOrderItem.getWorkQty().toString()));
+ if (issued.compareTo(ISSUED_TOLERANCE) <= 0) {
continue;
}
List<LocItem> locItems = new ArrayList<>();
@@ -621,47 +704,54 @@
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);
+ if (issued.compareTo(ISSUED_TOLERANCE) <= 0) {
+ break;
+ }
+ // 璇ュ簱浣嶅彲鍒嗛厤鏁伴噺锛氬彇鏈寰呭垎閰嶄笌搴撲綅搴撳瓨鐨勮緝灏忓��
+ double allocatable = Math.min(issued.doubleValue(), locItem.getAnfme() != null ? locItem.getAnfme() : 0);
+ ExistDto existDto = new ExistDto().setBatch(locItem.getBatch()).setMatnr(locItem.getMatnrCode()).setLocNo(locItem.getLocCode());
+ if (existDtos.add(existDto)) {
+ // 棣栨浣跨敤璇ュ簱浣嶏細鍔犲叆鍒楄〃骞舵墸鍑� issued
+ locItem.setOutQty(allocatable);
+ 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)
- );
+ 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());
+ 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);
}
-
- list.add(orderOutItemDto);
-
- issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
+ orderOutItemDto.setStaNos(maps);
+ //榛樿鑾峰彇绗竴绔欑偣
+ DeviceSite deviceSite = deviceSites.stream().findFirst().get();
+ orderOutItemDto.setSiteNo(deviceSite.getSite());
}
+
+ list.add(orderOutItemDto);
+ issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
+ } else {
+ // 璇ュ簱浣嶅凡琚墠搴忚鍗曡鍗犵敤锛氬彧鎵ｅ噺 issued锛屼笉閲嶅鍔犲叆鍒楄〃锛岄伩鍏嶄骇鐢熲�滃簱瀛樹笉瓒斥�濊剰鏁版嵁
+ issued = issued.subtract(new BigDecimal(String.valueOf(allocatable)));
}
}
- if (issued.doubleValue() > 0) {
+ if (issued.compareTo(ISSUED_TOLERANCE) > 0) {
+ double remaining = issued.setScale(6, RoundingMode.HALF_UP).doubleValue();
LocItem locItem = new LocItem()
.setId(new Random().nextLong())
.setMatnrCode(wkOrderItem.getMatnrCode())
.setMaktx(wkOrderItem.getMaktx())
.setAnfme(0.00)
- .setWorkQty(issued.doubleValue())
- .setOutQty(issued.doubleValue())
+ .setWorkQty(remaining)
+ .setOutQty(remaining)
.setUnit(wkOrderItem.getStockUnit())
.setBatch(wkOrderItem.getSplrBatch());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
@@ -711,7 +801,7 @@
p1.getUnit(),
p1.getTrackCode(),
p1.getFieldsIndex(),
- Math.round((p1.getAnfme() + p2.getAnfme()) * 100) / 100.0,
+ Math.round((p1.getAnfme() + p2.getAnfme())* 1000000) / 1000000.0,
p1.getWorkQty(),
p1.getTenantId(),
p1.getStatus(),
@@ -727,4 +817,25 @@
return waveItems;
}
+
+
+ /**
+ * @param id
+ * @return
+ * @author Ryan
+ * @description 瀹屾垚鍑哄簱鍗�
+ * @time 2025/4/25 10:07
+ */
+ @Override
+ public R completeOutOrderById(Long id) {
+ WkOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ return R.error("鍑哄簱鍗曚笉瀛樺湪锛侊紒");
+ }
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!this.updateById(order)) {
+ throw new CoolException("瀹屾垚鍑哄簱鍗曞け璐ワ紒锛�");
+ }
+ return R.ok("瀹屾垚鍑哄簱鍗曟垚鍔燂紒锛�");
+ }
}
--
Gitblit v1.9.1