查询多个生产单打包信息-增加包裹ID参数

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java

@@ -16,6 +16,12 @@ import java.util.List;
 @ExcelIgnoreUnannotated
 public class PlateDetailsRespVO {
 
+    @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long packageId;
+
+    @Schema(description = "包裹号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String packageNo;
+
     @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("房间名称")
     private String roomName;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -220,6 +220,12 @@ public class PackServiceImpl implements PackService {
 
         List<PlateDetailsRespVO> plateDetailsRespVOS = orderItemMapper.selectOrdersPlateList(orderIds, getUserOrganId());
 
+        List<Long> packageIds = plateDetailsRespVOS.stream().map(PlateDetailsRespVO::getPackageId).distinct().toList();
+
+        List<OrderPackageDO> orderPackageDOS = orderPackageMapper.selectBatchIds(packageIds);
+
+
+
         for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) {
             String name = "";
             if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) {
@@ -230,6 +236,11 @@ public class PackServiceImpl implements PackService {
                 name = name.substring(0, name.length() - 1);
             }
             plateDetailsRespVO.setProcessGroup(name);
+
+            plateDetailsRespVO.setPackageNo(orderPackageDOS.stream()
+                    .filter(m -> m.getId().equals(plateDetailsRespVO.getPackageId()))
+                    .map(OrderPackageDO::getPackageNo).findFirst().orElse(""));
+
         }
 
         return plateDetailsRespVOS;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml

@@ -118,6 +118,7 @@
 
 
     <resultMap id="PlateDetailsMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
+        <result property="packageId" column="packageId"/>
         <result property="roomName" column="roomName"/>
         <result property="cabinetName" column="bodyName"/>
         <result property="plateId" column="plateId"/>
@@ -429,6 +430,7 @@
 
 
         select distinct
+            oi.package_id as packageId,
             og.name as name,
             ob.room_name as roomName,
             ob.name as bodyName,