From e93ad4d2484af369194b39264e2dbd0d5a7e5885 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Sat, 11 May 2024 15:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81-=E6=89=93=E5=8C=85=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imes/module/executor/service/plate/PlateService.java   | 1 +
 .../controller/admin/pack/vo/PlateDetailsRespVO.java       | 7 +++++++
 .../manage/dal/mysql/query/ProductionStatusMapper.xml      | 6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java
index e6ed5dfe0..c1ce4231d 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java
@@ -89,6 +89,7 @@ public interface PlateService {
      */
     void updatePlateByRawGoodsId(List<GoodsSaveReqVO> createReqVOS);
 
+
     List<BodyPlateDetailVO> getPlateModelByPlateId(List<Long> bodyIds);
 
 }
\ No newline at end of file
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
index da4efebaf..8fe7d227d 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
@@ -20,6 +20,13 @@ public class PlateDetailsRespVO {
     @ExcelProperty("柜体名称")
     private String cabinetName;
 
+    @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String roomId;
+
+    @Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String bodyId;
+
+
     @Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("板编号")
     private String plateNo;
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml
index 2188d304e..45612d5a9 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml
@@ -53,6 +53,8 @@
 
         <collection property="plateDetailsRespVO" ofType="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
 
+            <result property="roomId" column="roomId"/>
+            <result property="bodyId" column="bodyId"/>
             <result property="roomName" column="roomName"/>
             <result property="cabinetName" column="bodyName"/>
             <result property="plateNo" column="plateId"/>
@@ -124,6 +126,8 @@
         when oi.plate_id !=0   then oi.plate_id end
         )as plateNum,
 
+        ob.room_id as roomId,
+        ob.id as bodyId,
         og.name as name,
         ob.room_name as roomName,
         ob.name as bodyName,
@@ -154,7 +158,7 @@
                 <foreach item="id" collection="collect" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-        group by orderNo,op.id,oi.package_id,name,roomName,bodyName,plateName,plateMaterial,plateColor,plateHeight,plateWidth,plateThickness,plateArea,texture,remark;
+        group by orderNo,op.id,oi.package_id,name,roomId,bodyId,roomName,bodyName,plateName,plateMaterial,plateColor,plateHeight,plateWidth,plateThickness,plateArea,texture,remark;
 
 
     </select>