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-14 18:22:42 +08:00
parent a83ef892b0
commit 0393c2ee1f
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
+13 -3
View File
@@ -252,21 +252,31 @@ public class StockOutTaskOrderApplicationService {
if (stockOutTaskOrderPO == null) {
return;
}
List<TaskPickingMaterialDetailPO> allDetails = new ArrayList<>();
// 按 materialDetailId 去重：taskStorageList 与 taskMaterialList 可能包含相同明细（按库位/按物料分组），避免重复导致 PC 端显示条数翻倍
Map<Long, TaskPickingMaterialDetailPO> allDetailsMap = new LinkedHashMap<>();
if (!CollectionUtils.isEmpty(stockOutTaskOrderPO.getTaskStorageList())) {
for (TaskStoragePO taskStorage : stockOutTaskOrderPO.getTaskStorageList()) {
if (!CollectionUtils.isEmpty(taskStorage.getTaskPickingMaterialDetailList())) {
allDetails.addAll(taskStorage.getTaskPickingMaterialDetailList());
for (TaskPickingMaterialDetailPO d : taskStorage.getTaskPickingMaterialDetailList()) {
if (d.getMaterialDetailId() != null) {
allDetailsMap.putIfAbsent(d.getMaterialDetailId(), d);
}
}
}
}
}
if (!CollectionUtils.isEmpty(stockOutTaskOrderPO.getTaskMaterialList())) {
for (TaskMaterialPO taskMaterial : stockOutTaskOrderPO.getTaskMaterialList()) {
if (!CollectionUtils.isEmpty(taskMaterial.getTaskPickingMaterialDetailList())) {
allDetails.addAll(taskMaterial.getTaskPickingMaterialDetailList());
for (TaskPickingMaterialDetailPO d : taskMaterial.getTaskPickingMaterialDetailList()) {
if (d.getMaterialDetailId() != null) {
allDetailsMap.putIfAbsent(d.getMaterialDetailId(), d);
}
}
}
}
}
List<TaskPickingMaterialDetailPO> allDetails = new ArrayList<>(allDetailsMap.values());
if (CollectionUtils.isEmpty(allDetails)) {
return;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
+2
View File
@@ -290,6 +290,8 @@ public class StockOutOrderDO extends BaseVOEntity {
@ApiModelProperty("小于复核状态: 1-未复核 2-复核中 3-已复核")
private Integer ltCheckStatus;
@ApiModelProperty("PDA复核查询tab: 1-列表(待复核) 2-历史记录(已复核)")
private Integer tabType;
@ApiModelProperty("to")
@Excel(name = "to")
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutOrder/StockOutOrderAssembler.java
+1
View File
@@ -35,6 +35,7 @@ public class StockOutOrderAssembler {
stockOutOrderDO.setCreateTimeEnd(stockOutOrderDTO.getCreateTimeEnd());
stockOutOrderDO.setAuditTimeStart(stockOutOrderDTO.getAuditTimeStart());
stockOutOrderDO.setAuditTimeEnd(stockOutOrderDTO.getAuditTimeEnd());
stockOutOrderDO.setTabType(stockOutOrderDTO.getTabType());
return stockOutOrderDO;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+2
View File
@@ -280,6 +280,8 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
@ApiModelProperty("小于复核状态: 1-未复核 2-复核中 3-已复核")
private Integer ltCheckStatus;
@ApiModelProperty("PDA复核查询tab: 1-列表(待复核) 2-历史记录(已复核)")
private Integer tabType;
@ApiModelProperty("to")
@Excel(name = "to")
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockOutOrder/StockOutOrderAppApi.java
+8 -2
View File
@@ -50,8 +50,14 @@ public class StockOutOrderAppApi extends BaseController {
stockOutOrderDO.setCheckOperatorsBy(userPo.getUserId());
stockOutOrderDO.setOrganizationId(userPo.getOrganizationId());
stockOutOrderDO.setTopOrganizationId(userPo.getTopOrganizationId());
stockOutOrderDO.setGtCheckStatus(null); // 清除，避免与 lt 冲突
stockOutOrderDO.setLtCheckStatus(3); // check_status < 3，只查未复核(1)、复核中(2)，不查已复核(3)
stockOutOrderDO.setGtCheckStatus(null);
stockOutOrderDO.setLtCheckStatus(null);
// tabType=2 历史记录：check_status>2(已复核)；否则 列表：check_status<3(未复核、复核中)
if (Integer.valueOf(2).equals(stockOutOrderDO.getTabType())) {
stockOutOrderDO.setGtCheckStatus(2);
} else {
stockOutOrderDO.setLtCheckStatus(3);
}
stockOutOrderDO.setDelFlag(1);
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) {