From 27eea2dd24d125c6f36215ef78a2762545885f15 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Sat, 18 May 2024 14:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95-=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9-=E5=AD=94=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/vo/PlateDetialRespVO.java   |  3 +++
 .../service/optimizeplan/OptimizePlanServiceImpl.java |  2 ++
 .../src/main/resources/mapper/plate/PlateMapper.xml   | 11 +++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java
index a1356bb23..e56504579 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java
@@ -84,6 +84,9 @@ public class PlateDetialRespVO {
     @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer openDoorType;
 
+    @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private Boolean  hasHole;
+
 
     @Schema(description = "生产单明细ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long itemId;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
index 96905b79d..4924e632d 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
@@ -304,7 +304,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
                 .eq(GoodsDO::getOrderId, orderId)
         );
+
         PlanDO planDO = planMapper.selectByOrderId(orderId);
+
         List<PlateDetialRespVO> plateDOS = plateMapper.selectPlateDetialList(orderId);
 
         List<OrderModelDO> orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL);
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index aa745972e..9d0730fa2 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -119,6 +119,7 @@
         <result property="bodyName" column="bodyName"/>
         <result property="roomName" column="roomName"/>
         <result property="processGroupName" column="processGroupName"/>
+        <result property="hasHole" column="hasHole"/>
 
     </resultMap>
     <select id="selectPlateDetialList"
@@ -129,7 +130,8 @@
                         oi.id as itemId,
                         ob.name as bodyName,
                         ob.room_name as roomName,
-                        og.name as processGroupName
+                        og.name as processGroupName,
+                        CASE WHEN op.unregular_point_count = 0 and op.front_hole_count  = 0  and op.back_hole_count = 0 and op.side_hole_count = 0 THEN false ELSE true END AS hasHole
         from order_plate op
                  join order_item oi on op.id = oi.plate_id
                  join order_body ob on oi.body_id = ob.id
@@ -147,7 +149,8 @@
                         oi.id as itemId,
                         ob.name as bodyName,
                         ob.room_name as roomName,
-                        og.name as processGroupName
+                        og.name as processGroupName,
+                        CASE WHEN op.unregular_point_count = 0 and op.front_hole_count  = 0  and op.back_hole_count = 0 and op.side_hole_count = 0 THEN false ELSE true END AS hasHole
         from order_plate op
                  join order_item oi on op.id = oi.plate_id
                  join order_body ob on oi.body_id = ob.id
@@ -155,9 +158,9 @@
 
         where op.order_id in
 
-        <foreach collection="orderIds" item="id" open="(" close=")" separator=",">
+        <foreach collection="orderIds" item="orderIds" open="(" close=")" separator=",">
 
-            #{id}
+            #{orderIds}
 
         </foreach>