优化排单-生产单数据参数修改-孔字段添加

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;

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);

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>