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

收货修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-15 16:46:35 +08:00
parent 187a716175
commit 02bd2275a8
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+25 -15
View File
@@ -186,26 +186,36 @@ public class StockShelfOrderApplicationService {
} }
/** /**
* 获取上架单详细信息 * 获取上架单详细信息（PC端：不添加 parent_copy，收货无子项时上架也不显示子项）
*/ */
public StockShelfOrderPO getInfo(Long shelfOrderId) public StockShelfOrderPO getInfo(Long shelfOrderId) {
{ return getInfo(shelfOrderId, false);
}
/**
* 获取上架单详细信息
* @param shelfOrderId 上架单ID
* @param addParentCopyWhenNoChildren 主项无子项时是否添加 parent_copy：true-PDA 详情页从 children 读取数据需要；false-PC 端收货无子项时上架不显示虚拟子项
*/
public StockShelfOrderPO getInfo(Long shelfOrderId, boolean addParentCopyWhenNoChildren) {
StockShelfOrderPO stockShelfOrderPO = stockShelfOrderDomainService.getInfo(shelfOrderId); StockShelfOrderPO stockShelfOrderPO = stockShelfOrderDomainService.getInfo(shelfOrderId);
ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO(); ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
shelfMaterialDetailDO.setShelfOrderNumber(stockShelfOrderPO.getShelfOrderNumber()); shelfMaterialDetailDO.setShelfOrderNumber(stockShelfOrderPO.getShelfOrderNumber());
List<ShelfMaterialDetailPO> shelfMaterialDetailPOList = shelfMaterialDetailDomainService.queryListChildren(shelfMaterialDetailDO); List<ShelfMaterialDetailPO> shelfMaterialDetailPOList = shelfMaterialDetailDomainService.queryListChildren(shelfMaterialDetailDO);
// 主项无子项时：添加 parent_copy 到 children，供详情页展示（详情页从 children 读取数据） // PDA：主项无子项时添加 parent_copy 到 children，供详情页展示（详情页从 children 读取数据）；PC：不添加，避免收货无子项时上架显示虚拟子项
for (ShelfMaterialDetailPO parent : shelfMaterialDetailPOList) { if (addParentCopyWhenNoChildren) {
if (CollectionUtils.isEmpty(parent.getChildren())) { for (ShelfMaterialDetailPO parent : shelfMaterialDetailPOList) {
ShelfMaterialDetailPO parentCopy = new ShelfMaterialDetailPO(); if (CollectionUtils.isEmpty(parent.getChildren())) {
BeanUtils.copyProperties(parent, parentCopy, "children"); ShelfMaterialDetailPO parentCopy = new ShelfMaterialDetailPO();
parentCopy.setLevel(2); BeanUtils.copyProperties(parent, parentCopy, "children");
parentCopy.setParentUniqueId(parent.getUniqueId()); parentCopy.setLevel(2);
parentCopy.setQuantity(null); parentCopy.setParentUniqueId(parent.getUniqueId());
parentCopy.setChildren(new ArrayList<>()); parentCopy.setQuantity(null);
List<ShelfMaterialDetailPO> children = new ArrayList<>(); parentCopy.setChildren(new ArrayList<>());
children.add(parentCopy); List<ShelfMaterialDetailPO> children = new ArrayList<>();
parent.setChildren(children); children.add(parentCopy);
parent.setChildren(children);
}
} }
} }
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockShelfOrder/StockShelfOrderAppApi.java
+2 -2
View File
@@ -47,13 +47,13 @@ public class StockShelfOrderAppApi extends BaseController {
} }
/** /**
* 获取上架单详细信息 * 获取上架单详细信息（PDA：主项无子项时添加 parent_copy，供详情页从 children 读取数据）
*/ */
@ApiOperation("获取上架单") @ApiOperation("获取上架单")
@GetMapping(value = "/getInfo") @GetMapping(value = "/getInfo")
public AjaxResult getInfo(Long shelfOrderId) public AjaxResult getInfo(Long shelfOrderId)
{ {
return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId)); return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true));
} }