From 4801ac8a9dbcd3c64e7851c01efa8d82ac0a201c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:31:40 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 8c4ccf6..81f1c12 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -532,6 +532,12 @@
return mergePreviewDtos;
}
+ /**
+ * 娉㈡鍑哄簱棰勮
+ *
+ * @param param
+ * @return
+ */
@Transactional(rollbackFor = Exception.class)
public List<MergePreviewResultDto> orderOutMergeLocPreview(List<MergePreviewDto> param) {
if (param == null) {
@@ -567,7 +573,7 @@
//鏌ヨ骞冲簱涓鍚堟潯浠剁殑搴撳瓨
List<LocDetl> locs = locDetlService.queryFlatStock(pars.getMatnr(), pars.getBatch(), pars.getFieldParams());
if (!locs.isEmpty()) {
- double anfme = pars.getAnfme() - pars.getWorkQty();
+ Double anfme = pars.getAnfme() - pars.getWorkQty();
for (LocDetl detl : locs) {
Loc loc = locService.getById(detl.getLocId());
if (loc == null) {
@@ -582,7 +588,7 @@
locDto.setLocNo(detl.getLocNo());
locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id);
locDto.setLocDetlId(detl.getId());
- locDto.setAnfme(detl.getAnfme());
+ locDto.setAnfme(detl.getAnfme() - detl.getWorkQty());
locDto.setWorkQty(detl.getWorkQty());
locDtos.add(locDto);
//搴撲綅瀹為檯鍙敤鏁伴噺
@@ -591,8 +597,8 @@
continue;
}
//娉㈡鏁伴噺鍑忓幓搴撲綅鍙敤鏁伴噺鍚庯紝鐩堜綑鏁伴噺
- anfme = anfme - surplusQty;
- if (anfme > 0) {
+ anfme = Math.round((anfme - surplusQty) * 10000) / 10000.0;
+ if (anfme.compareTo(0.0) > 0) {
//褰撳墠鍙娇鐢ㄦ暟閲�
resultDto.setFetchQty(surplusQty);
//浣欎笅闇�姹傛暟閲�
@@ -1143,7 +1149,7 @@
.eq(WaveDetl::getStockIndex, matUniqueKey)
.eq(WaveDetl::getWaveId, wave.getId()));
if (waveDetl == null) {
- throw new CoolException("waveId:" + wave.getId() + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�");
+ throw new CoolException("waveId:" + wave.getId() + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�");
}
waveDetl.setWorkQty(waveDetl.getWorkQty() + taskDetl.getAnfme());
waveDetl.setUpdateTime(new Date());
@@ -1633,7 +1639,10 @@
for (LocDetl locDetl : param.getLocDetls()) {
List<OrderOutMergeParam> orders = new ArrayList<>();
- LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locDetl.getLocNo()));
+ LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatId, locDetl.getLocId())
+ .eq(LocDetl::getBatch, locDetl.getLocId())
+ .eq(LocDetl::getLocNo, locDetl.getLocNo()));
if (Objects.isNull(detl)) {
continue;
}
--
Gitblit v1.9.1