weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PDA拣货查询修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-15 15:41:50 +08:00
parent 1a9bd1bcbf
commit 1d3924d3ce
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/service/StockOutTaskOrderDomainService.java
+4 -11
View File
@@ -260,19 +260,12 @@ public class StockOutTaskOrderDomainService {
if (quantityAll.compareTo(BigDecimal.ZERO) > 0 && pickingQuantityAll.compareTo(quantityAll) >= 0){ if (quantityAll.compareTo(BigDecimal.ZERO) > 0 && pickingQuantityAll.compareTo(quantityAll) >= 0){
totalPickingMaterialQuantity += 1; totalPickingMaterialQuantity += 1;
} }
// 过滤掉已拣货完成的明细，只展示待拣货的
List<TaskPickingMaterialDetailPO> incompleteList = taskPickingMaterialDetailPOListByStorage.stream()
.filter(d -> d.getQuantity() != null && (d.getPickingQuantity() == null || d.getPickingQuantity().compareTo(d.getQuantity()) < 0))
.collect(Collectors.toList());
if (CollectionUtil.isEmpty(incompleteList)){
continue;
}
TaskStoragePO taskStoragePO = new TaskStoragePO(); TaskStoragePO taskStoragePO = new TaskStoragePO();
BeanUtils.copyProperties(incompleteList.get(0), taskStoragePO); BeanUtils.copyProperties(taskPickingMaterialDetailPOListByStorage.get(0), taskStoragePO);
BigDecimal quantity = BigDecimal.ZERO; BigDecimal quantity = BigDecimal.ZERO;
BigDecimal pickingQuantity = BigDecimal.ZERO; BigDecimal pickingQuantity = BigDecimal.ZERO;
BigDecimal waitPickingQuantity = BigDecimal.ZERO; BigDecimal waitPickingQuantity = BigDecimal.ZERO;
for (TaskPickingMaterialDetailPO taskPickingMaterialDetailPO : incompleteList) { for (TaskPickingMaterialDetailPO taskPickingMaterialDetailPO : taskPickingMaterialDetailPOListByStorage) {
quantity = quantity.add(taskPickingMaterialDetailPO.getQuantity()); quantity = quantity.add(taskPickingMaterialDetailPO.getQuantity());
pickingQuantity = pickingQuantity.add(taskPickingMaterialDetailPO.getPickingQuantity() != null ? taskPickingMaterialDetailPO.getPickingQuantity() : BigDecimal.ZERO); pickingQuantity = pickingQuantity.add(taskPickingMaterialDetailPO.getPickingQuantity() != null ? taskPickingMaterialDetailPO.getPickingQuantity() : BigDecimal.ZERO);
waitPickingQuantity = waitPickingQuantity.add(taskPickingMaterialDetailPO.getWaitPickingQuantity() != null ? taskPickingMaterialDetailPO.getWaitPickingQuantity() : BigDecimal.ZERO); waitPickingQuantity = waitPickingQuantity.add(taskPickingMaterialDetailPO.getWaitPickingQuantity() != null ? taskPickingMaterialDetailPO.getWaitPickingQuantity() : BigDecimal.ZERO);
@@ -284,12 +277,12 @@ public class StockOutTaskOrderDomainService {
Integer pickingStatus = judgePickingQuantity(pickingQuantity, quantity); Integer pickingStatus = judgePickingQuantity(pickingQuantity, quantity);
taskStoragePO.setPickingStatus(pickingStatus); taskStoragePO.setPickingStatus(pickingStatus);
// actualQuantity 为输入框字段，默认等于待拣货数量，供 PDA 表单默认展示 // actualQuantity 为输入框字段，默认等于待拣货数量，供 PDA 表单默认展示
for (TaskPickingMaterialDetailPO d : incompleteList) { for (TaskPickingMaterialDetailPO d : taskPickingMaterialDetailPOListByStorage) {
if (d.getWaitPickingQuantity() != null) { if (d.getWaitPickingQuantity() != null) {
d.setActualQuantity(d.getWaitPickingQuantity()); d.setActualQuantity(d.getWaitPickingQuantity());
} }
} }
taskStoragePO.setTaskPickingMaterialDetailList(incompleteList); taskStoragePO.setTaskPickingMaterialDetailList(taskPickingMaterialDetailPOListByStorage);
taskStoragePOList.add(taskStoragePO); taskStoragePOList.add(taskStoragePO);
} }
// 拣货进度：已完成数/拣货明细总数（按库位分组，几种库位就几种明细） // 拣货进度：已完成数/拣货明细总数（按库位分组，几种库位就几种明细）