From bba9c7f7bc8aabe6641c91ca2cad79826e71b5bd Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Sat, 11 May 2024 14:22:45 +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=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/pack/PackController.java |  8 +--
 .../manage/service/pack/PackServiceImpl.java  |  4 --
 .../mysql/query/ProductionStatusMapper.xml    | 50 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
index 1131756a0..3dc8f17d2 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
@@ -88,10 +88,10 @@ public class PackController {
 
 
 
-    @GetMapping("/getOrderPlate")
-    @Operation(summary = "查看生产订单对应的板材信息")
-    @Parameter(name = "orderId", description = "生产单Id", required = true)
-    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
+//    @GetMapping("/getOrderPlate")
+//    @Operation(summary = "查看生产订单对应的板材信息")
+//    @Parameter(name = "orderId", description = "生产单Id", required = true)
+//    @PreAuthorize("@ss.hasPermission('manage:pack:query')")
     public CommonResult<OrderPlateDetailsRespVO> getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) {
 
         return success(packService.getOrderPlateList(orderId));
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
index ac0d7e0b2..35bd49415 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java
@@ -66,20 +66,16 @@ public class PackServiceImpl implements PackService {
 
 //        PageDTO<PackRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
-
         // 根据生产状态查询生产单号
         List<Long> collect = productionStatusMapper.selectPackPage(pageReqVO).stream().map(OrderDO::getId).collect(Collectors.toList());
 
-
         PageHelper.startPage(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         // 查询打包首页分页数据信息，包裹数，板件数量信息
         List<PackRespVO> packRespVOS = productionStatusMapper.selectOrderPlate(collect);
 
-
         PageInfo<PackRespVO> pageInfo = new PageInfo<>(packRespVOS);
 
-
         // 转换成 PageResult 分页类型
         PageResult<PackRespVO> priceRateReqVOPageResult = PageHelperUtil.convertToPageResult(pageInfo);
 
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 8ac5b0fee..2188d304e 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
@@ -50,6 +50,27 @@
         <result property="packCount" column="packNum"/>
         <result property="totalPieceCount" column="plateNum"/>
         <result property="packPieceCount" column="plateProcessedNum"/>
+
+        <collection property="plateDetailsRespVO" ofType="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
+
+            <result property="roomName" column="roomName"/>
+            <result property="cabinetName" column="bodyName"/>
+            <result property="plateNo" column="plateId"/>
+            <result property="plateName" column="plateName"/>
+            <result property="material" column="plateMaterial"/>
+            <result property="color" column="plateColor"/>
+            <result property="width" column="plateWidth"/>
+            <result property="height" column="plateHeight"/>
+            <result property="thickness" column="plateThickness"/>
+            <result property="area" column="plateArea"/>
+            <result property="texture" column="texture"/>
+            <result property="specialShaped" column="specialShaped"/>
+            <result property="profiling" column="profiling"/>
+            <result property="rowHole" column="rowHole"/>
+            <result property="remark" column="remark"/>
+            <result property="processGroup" column="name"/>
+
+        </collection>
     </resultMap>
 
     <select id="selectOrderPlate"
@@ -101,14 +122,39 @@
         count(distinct
         case
         when oi.plate_id !=0   then oi.plate_id end
-        )as plateNum
+        )as plateNum,
+
+        og.name as name,
+        ob.room_name as roomName,
+        ob.name as bodyName,
+
+        op.name as plateName,
+        ogs.material as plateMaterial,
+        ogs.color as plateColor,
+        ogs.height as plateHeight,
+        ogs.width as plateWidth,
+        ogs.thickness as plateThickness,
+        op.area as plateArea,
+        op.texture as texture ,
+        op.remark as remark,
+
+        CASE WHEN op.unregular_point_count = 0  THEN '否' ELSE '是' END AS specialShaped,
+        CASE WHEN front_model_count = 0 or op.back_hole_count or op.side_hole_count THEN '否' ELSE '是' END AS profiling,
+        CASE WHEN front_hole_count = 0 or op.back_model_count THEN '否' ELSE '是' END AS rowHole
+
         FROM `order` o
         join order_item oi on o.id = oi.order_id
+        join order_plate op on oi.plate_id = op.id
+        join order_goods ogs on op.goods_id = ogs.id
+        join order_body ob on oi.body_id = ob.id
+        join order_group og on ob.id = og.body_id
+
+
             WHERE o.id in
                 <foreach item="id" collection="collect" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-        group by orderNo;
+        group by orderNo,op.id,oi.package_id,name,roomName,bodyName,plateName,plateMaterial,plateColor,plateHeight,plateWidth,plateThickness,plateArea,texture,remark;
 
 
     </select>