From adfce6c5a94c7aefa9b5d4f67e63db7eaac268d9 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期二, 07 一月 2025 20:29:31 +0800
Subject: [PATCH] #拣货单功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 251 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 202 insertions(+), 49 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 b5b2641..8d3b95f 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
@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 鍑哄簱绠＄悊
@@ -66,7 +67,7 @@
/**
* 鍑哄簱
*/
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void out(OutParam outParam) {
if (outParam.getOperationPort() == null) {
throw new CoolException("浣滀笟鍙ｄ笉瀛樺湪");
@@ -152,7 +153,6 @@
if (orderDetlIds.isEmpty()) {
throw new CoolException("璁㈠崟鏄庣粏涓嶈兘涓虹┖");
}
-
List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getId, orderDetlIds).orderByAsc(OrderDetl::getOrderNo, OrderDetl::getCreateTime));
if (orderDetls.isEmpty()) {
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
@@ -160,8 +160,39 @@
orderDetls = orderDetlService.parseDetl(orderDetls);
HashMap<Long, List<LocDetl>> orderDetlLocMap = new HashMap<>();
+// //鍑哄簱璁㈠崟鍚堣
List<OutDetlDto> detlDtos = new ArrayList<>();
+// //鑾峰彇骞充粨涓鍚堟潯浠剁殑鎵�鏈夊簱浣�
+// orderDetls.forEach(detl -> {
+// double issued = Optional.of(detl.getAnfme() - detl.getQty() - detl.getWorkQty()).orElse(0.0D);
+// if (issued <= 0.0D) {
+// return;
+// }
+// List<LocDetl> locs = locDetlService.queryFlatStock(detl.getMat$().getMatnr(), detl.getBatch(), detl.getUniqueField());
+// //骞冲簱鏈夊綋鏄庣墿鏂欎紭鍏堝嚭搴�
+// if (!locs.isEmpty()) {
+// for (LocDetl locDetl : locs) {
+// if (issued > 0) {
+// OutDetlDto outDetlDto = new OutDetlDto();
+// outDetlDto.setDetlId(locDetl.getId());
+// outDetlDto.setAnfme(issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+// outDetlDto.setStock(locDetl.getAnfme());
+// outDetlDto.setOrderDetlId(locDetl.getId());
+// detlDtos.add(outDetlDto);
+// issued = issued - outDetlDto.getAnfme();
+// }
+// }
+// //璁㈠崟鏄庣粏闇�鍑哄簱鏁伴噺
+// double workQty = Optional.of(detl.getAnfme() - detl.getQty() - detl.getWorkQty()).orElse(0.0D);
+// //鏇存柊骞冲簱璁㈠崟鏄庣粏鐨勫疄闄呭彲鐢ㄦ暟閲�
+// detl.setWorkQty(workQty - issued);
+// }
+// });
+ /**
+ * 骞冲簱浼樺厛鍑哄簱瀹屾垚鍚庯紝褰撹鍗曟槑缁唚orkQty + qty 杩樹笉绛変簬anfme鏃讹紝鏌ヨTCU搴�
+ */
+ //鑾峰彇TCU绗﹀悎鏉′欢搴撲綅
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
@@ -270,7 +301,7 @@
return previewDtos;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void orderOutBatch(List<OrderOutBatchPreviewDto> param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -485,11 +516,10 @@
mergePreviewDtos.add(dto);
}
-
return mergePreviewDtos;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public List<MergePreviewResultDto> orderOutMergeLocPreview(List<MergePreviewDto> param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -509,7 +539,68 @@
sortParams.add(sortParam);
List<MergePreviewResultDto> resultDtos = new ArrayList<>();
+
+ param.forEach(pars -> {
+ List<MergePreviewResultLocDto> locDtos = new ArrayList<>();
+ MergePreviewResultDto resultDto = new MergePreviewResultDto();
+ resultDto.sync(pars);
+ resultDto.setOrderIds(pars.getOrderIds());
+ resultDto.setLocs(locDtos);
+
+ List<LocDetl> locs = locDetlService.queryFlatStock(pars.getMatnr(), pars.getBatch(), pars.getFieldParams());
+ if (!locs.isEmpty()) {
+ double anfme = pars.getAnfme() - pars.getWorkQty();
+ for (LocDetl detl : locs) {
+ Loc loc = locService.getById(detl.getLocId());
+ if (loc == null) {
+ throw new CoolException("搴撲綅鏁版嵁涓嶅瓨鍦�");
+ }
+
+ if (loc.getLocStsId() != LocStsType.F.val()) {
+ continue;
+ }
+ MergePreviewResultLocDto locDto = new MergePreviewResultLocDto();
+ locDto.setLocId(detl.getLocId());
+ locDto.setLocNo(detl.getLocNo());
+ locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id);
+ locDto.setLocDetlId(detl.getId());
+
+ locDtos.add(locDto);
+ //搴撲綅瀹為檯鍙敤鏁伴噺
+ double surplusQty = detl.getAnfme() - detl.getWorkQty();
+ //娉㈡鏁伴噺鍑忓幓搴撲綅鍙敤鏁伴噺鍚庯紝鐩堜綑鏁伴噺
+ anfme = anfme - surplusQty;
+ if (anfme > 0) {
+ locDto.setAnfme(detl.getAnfme());
+ locDto.setWorkQty(surplusQty);
+ } else {
+ locDto.setAnfme(pars.getAnfme() - pars.getWorkQty());
+ locDto.setWorkQty(pars.getAnfme() - pars.getWorkQty());
+ break;
+ }
+ }
+ //淇濆瓨鍑哄簱鏁伴噺锛堝钩搴擄級
+ pars.setWorkQty(pars.getAnfme() - pars.getWorkQty() - anfme);
+
+ resultDto.setOtherLocs(new ArrayList<>());
+
+ resultDto.setAnfme(pars.getAnfme());
+
+ resultDtos.add(resultDto);
+
+ } else {
+ resultDto.sync(pars);
+ resultDto.setLocs(new ArrayList<>());
+ resultDto.setOrderIds(pars.getOrderIds());
+ resultDto.setAnfme(pars.getAnfme());
+ resultDtos.add(resultDto);
+ }
+ });
+
for (MergePreviewDto dto : param) {
+ Double anfme = dto.getAnfme() - dto.getWorkQty();
+ //鍑忓幓骞冲簱鏁伴噺鍚庯紝灏忎簬绛変簬0锛岃烦鍑哄鐞�
+ if (anfme <= 0) {continue;}
List<LocDetl> locDetls = locDetlService.queryStock(dto.getMatnr(), dto.getBatch(), dto.getFieldParams(), sortParams);
if(locDetls.isEmpty()){
MergePreviewResultDto resultDto = new MergePreviewResultDto();
@@ -525,10 +616,9 @@
MergePreviewResultDto resultDto = new MergePreviewResultDto();
resultDto.sync(dto);
- resultDto.setLocs(locDtos);
resultDto.setOrderIds(dto.getOrderIds());
-
- Double anfme = dto.getAnfme();
+// Double anfme = dto.getAnfme();
+ resultDto.setLocs(locDtos);
for (LocDetl locDetl : locDetls) {
Loc loc = locService.getById(locDetl.getLocId());
if (loc == null) {
@@ -581,7 +671,7 @@
return resultDtos;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void orderOutMerge(OrderOutMergeParamDto dto) {
if(dto == null){
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -783,6 +873,18 @@
}
+
+ /**
+ * 娉㈡鐢熸垚鍑哄簱浠诲姟
+ * UTC鍑哄簱浠诲姟閫昏緫涓嶅彉锛屾坊鍔犲钩搴撳垽鍒�昏緫
+ * 1. 鑾峰彇娉㈡璁㈠崟鏄庣粏锛屽垽鍒槸鍚︿负骞冲簱璁㈠崟
+ * 2. 骞冲簱璁㈠崟鐢熸垚鎷ｈ揣鍗曪紝 UTC璁㈠崟鐢熸垚鍑哄簱浠诲姟
+ * 3. 骞冲簱鍗曟嵁鏄庣粏鎵�鍗犲簱浣嶇墿鏂欐暟閲忓姞閿�
+ * 4. 鐢熸垚鍑哄簱鍗昉DA绔紝缁熶竴鍑哄簱鎵ｅ噺搴撳瓨
+ * 5. 鐢熸垚鎷ｈ揣鍗曞巻鍙叉。锛屽嚭搴撳崟鎹姞鍏ュ巻鍙叉。锛屽垹闄ゅ師鍗曟嵁
+ * 6. 鍒犻櫎娉㈡鍒楄〃鏁版嵁
+ * @param dto
+ */
@Transactional(rollbackFor = Exception.class)
public void orderOutMergeWave(OrderOutMergeParamDto dto) {
if(dto == null){
@@ -793,28 +895,33 @@
throw new CoolException("鏈敓鎴愭尝娆�");
}
- List<OrderOutMergeParam> params = dto.getList();
-
- if (params.isEmpty()) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ Wave wave = waveService.getById(dto.getWaveId());
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡涓嶅瓨鍦�");
}
- Long waveId = dto.getWaveId();
+ /**
+ * 娉㈡鍚堝苟鍑哄簱
+ * 1. 鍒ゆ柇鏄钩搴撹繕TCU搴�
+ * 2. 鏍规嵁鍗曞簱鍗曟嵁绫诲瀷
+ * 2. 骞冲簱鐢熸垚鎷ｈ揣鍗�
+ * 3. TCU搴撶敓鎴愪换鍔″崟
+ */
+ outStockByArea(dto, wave);
- List<Long> filterParamsList = new ArrayList<>();
- List<OrderOutMergeParam> filterParams = new ArrayList<>();
+ //娉㈡鐘舵�佷慨鏀逛负--鐢熸垚浠诲姟
+ wave.setWaveStatus(WaveStatusType.GENERATE.id);
+ wave.setUpdateTime(new Date());
+ if (!waveService.updateById(wave)) {
+ throw new CoolException("娉㈡鏇存柊澶辫触");
+ }
+ }
- params.forEach(action -> {
- if (action.getLocId() != null) {
- filterParamsList.add(action.getLocId());
- filterParams.add(action);
- }
- });
-
+ private Map<Long, List<OrderOutMergeDto>> checkLoc(List<OrderOutMergeParam> mergeParams, Wave wave) {
HashMap<String, Double> stockMap = new HashMap<>();
- for (OrderOutMergeParam param : filterParams) {
+ for (OrderOutMergeParam param : mergeParams) {
String matUniqueKey = Utils.getMatUniqueKey(param.getMatnr(), param.getBatch(), param.getFieldParams());
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));
if(waveDetl == null){
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -826,7 +933,7 @@
}
HashMap<Long, List<OrderOutMergeDto>> map = new HashMap<>();
- for (OrderOutMergeParam param : filterParams) {
+ for (OrderOutMergeParam param : mergeParams) {
LocDetl locDetl = locDetlService.getById(param.getLocDetlId());
if(locDetl == null) {
continue;
@@ -862,6 +969,57 @@
if (map.isEmpty()) {
throw new CoolException("搴撳瓨涓嶈冻");
}
+
+ return map;
+ }
+
+ /**
+ * 鏍规嵁涓嶅悓搴撲綅绫诲瀷鐢熸垚鍑哄簱鎷ｅ崟鍙奣UC浠诲姟妗�
+ * @param dto
+ * @param wave
+ */
+ private void outStockByArea(OrderOutMergeParamDto dto, Wave wave) {
+ List<OrderOutMergeParam> params = dto.getList();
+ if (params.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ //骞冲簱鏁版嵁婧�
+ List<OrderOutMergeParam> flatOrders = new ArrayList<>();// listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_FLAT);
+ //TUC鏁版嵁婧�
+ List<OrderOutMergeParam> tucOrders = new ArrayList<>();//listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_UTC);
+ //鎸夊簱浣嶇被鍨嬪垎绫�
+ Map<Long, List<OrderOutMergeParam>> listMap = params.stream().collect(Collectors.groupingBy(OrderOutMergeParam::getTypeId));
+
+ //鏁版嵁鍒嗙被 1.骞冲簱鏁版嵁 2. TUC鏁版嵁
+ listMap.keySet().forEach(key -> {
+ if (key == LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id) {
+ flatOrders.addAll(listMap.get(key));
+ } else {
+ tucOrders.addAll(listMap.get(key));
+ }
+ });
+ if (flatOrders.isEmpty()) {
+ //骞冲簱鍑哄簱
+ outStockByFlat(flatOrders, wave);
+ }
+
+ if (tucOrders.isEmpty()) {
+ //TUC鍑哄簱
+ outStockByTUC(tucOrders, wave);
+ }
+
+
+ }
+
+ /**
+ * TUC鍑哄簱--鐢熸垚鍑哄簱浠诲姟妗�
+ *
+ * @param tucOrders
+ * @param wave
+ */
+ private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {
+ Map<Long, List<OrderOutMergeDto>> map = checkLoc(tucOrders, wave);
for (Map.Entry<Long, List<OrderOutMergeDto>> entry : map.entrySet()) {
Long locId = entry.getKey();
@@ -912,7 +1070,8 @@
taskDetl.setTaskNo(task.getTaskNo());
taskDetl.setAnfme(merge.getAnfme());
taskDetl.setStock(locDetl.getAnfme());
- taskDetl.setWaveId(waveId);
+ taskDetl.setWaveId(wave.getId());
+ taskDetl.setWaveNo(wave.getWaveNo());
taskDetl.setOrderId(null);
taskDetl.setOrderNo(null);
if (!taskDetlService.save(taskDetl)) {
@@ -931,11 +1090,8 @@
}
}
-
- //TODO 纭鍚庯紝闇�灏嗘敞閲婃墦寮�
String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
-// WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId), false);
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));
if (waveDetl == null) {
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -946,13 +1102,6 @@
}
}
-// //搴撳瓨鏇存柊閫昏緫
- List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));
- orderDetls.forEach(orderDetl -> {
- orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());
- });
-
//搴撲綅F => R
loc.setLocStsId(LocStsType.R.val());
loc.setUpdateTime(new Date());
@@ -961,19 +1110,23 @@
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐�");
}
}
-
- Wave wave = waveService.getById(waveId);
- if (wave == null) {
- throw new CoolException("娉㈡涓嶅瓨鍦�");
- }
-
- wave.setWaveStatus(WaveStatusType.GENERATE.id);
- wave.setUpdateTime(new Date());
- if (!waveService.updateById(wave)) {
- throw new CoolException("娉㈡鏇存柊澶辫触");
- }
}
+ /**
+ * 骞冲簱鍑哄簱--鐢熸垚鍑哄簱鎷ｈ揣鍗�
+ *
+ * @param flatOrders
+ * @param wave
+ */
+ private void outStockByFlat(List<OrderOutMergeParam> flatOrders, Wave wave) {
+ Map<Long, List<OrderOutMergeDto>> map = checkLoc(flatOrders, wave);
+
+
+
+
+ }
+
+
@Transactional(rollbackFor = Exception.class)
public void generateWave(GenerateWaveParam param) {
if (param == null) {
--
Gitblit v1.9.1