PDA收货上架修改内容

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java

@@ -6,6 +6,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfoApi;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.wms.application.service.stockReceiptOrder.StockReceiptOrderApplicationService;
+import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
 import com.mhd.wms.interfaces.assember.stockReceiptOrder.StockReceiptOrderAssembler;
@@ -62,6 +63,20 @@ public class StockReceiptOrderAppApi extends BaseController {
         return AjaxResult.success(stockReceiptOrderApplicationService.getInfoByApp(receiptOrderId, receiptStatus));
     }
 
+    /**
+     * PDA：查询某计划行（卡片）下所有 level=2 分批收货子行（含首笔仅落主行时的主行快照），附带序列号。
+     */
+    @ApiOperation("按父计划行查询分批收货子行（level=2）")
+    @GetMapping("/listLevel2ChildrenByParent")
+    public AjaxResult listLevel2ChildrenByParent(
+            @ApiParam(value = "收货单ID", required = true) @RequestParam Long receiptOrderId,
+            @ApiParam(value = "收货明细 material_detail_id（计划行或子行均可，会解析到计划父行）", required = true)
+            @RequestParam Long materialDetailId) {
+        List<ReceiptMaterialDetailPO> list = stockReceiptOrderApplicationService.listLevel2ChildrenByParentForApp(
+                receiptOrderId, materialDetailId);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 收货
      */

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockShelfOrder/StockShelfOrderAppApi.java

@@ -5,11 +5,13 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfoApi;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.wms.application.service.stockShelfOrder.StockShelfOrderApplicationService;
+import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO;
 import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO;
 import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO;
 import com.mhd.wms.interfaces.assember.stockShelfOrder.StockShelfOrderAssembler;
 import com.mhd.wms.interfaces.dto.stockShelfOrder.StockShelfOrderDTO;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,7 +49,7 @@ public class StockShelfOrderAppApi extends BaseController {
     }
 
     /**
-     * 获取上架单详细信息（PDA：主项无子项时添加 parent_copy，供详情页从 children 读取数据）
+     * 获取上架单详细信息（PDA：与收货 getInfoByApp 一致保留父子结构；子行计划数量在服务端清空，见 StockShelfOrderApplicationService#getInfo）
      */
     @ApiOperation("获取上架单")
     @GetMapping(value = "/getInfo")
@@ -58,6 +60,19 @@ public class StockShelfOrderAppApi extends BaseController {
         return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true, shelfStatus));
     }
 
+    /**
+     * PDA：查询某计划行（卡片）下所有 level=2 分批上架子行（含首笔仅落主行时的主行快照），附带序列号。
+     */
+    @ApiOperation("按父计划行查询分批上架子行（level=2）")
+    @GetMapping("/listLevel2ChildrenByParent")
+    public AjaxResult listLevel2ChildrenByParent(
+            @ApiParam(value = "上架单ID", required = true) @RequestParam Long shelfOrderId,
+            @ApiParam(value = "上架明细 material_detail_id（计划行或子行均可，会解析到计划父行）", required = true)
+            @RequestParam Long materialDetailId) {
+        List<ShelfMaterialDetailPO> list = stockShelfOrderApplicationService.listLevel2ChildrenByParentForApp(
+                shelfOrderId, materialDetailId);
+        return AjaxResult.success(list);
+    }
 
     @ApiOperation("上架")
     @PostMapping("/upShelf")