获取生产单源数据-优化时的数据参数修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java

@@ -8,8 +8,8 @@ import lombok.Data;
 @Data
 public class OptimizePlateDetialRespVO {
 
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long id;
+    @Schema(description = "大板ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long boardId;
 
     @Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED)
     private String plateName;
@@ -20,8 +20,8 @@ public class OptimizePlateDetialRespVO {
     @Schema(description = "颜色", requiredMode = Schema.RequiredMode.REQUIRED)
     private String color;
 
-    @Schema(description = "纹路类型，0 正纹 1 可翻转 2 反纹", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer texture;
+    @Schema(description = "是否有纹路", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean  hasTexture;
 
     @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED)
     private Double  thickness;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -304,10 +304,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         OrderSource orderSource = new OrderSource();
 
         List<OptimizePlateDetialRespVO> optimizePlateDetialRespVO = plateMapper.selectPlate(orderId);
-        // 赋值随机ID
-        for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) {
-            plateDetialRespVO.setId(snowflake.nextId());
-        }
 
         List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
                 .eq(GoodsDO::getOrderId, orderId)
@@ -346,10 +342,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         List<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList());
 
         List<OptimizePlateDetialRespVO> optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds);
-        // 赋值随机ID
-        for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) {
-            plateDetialRespVO.setId(snowflake.nextId());
-        }
 
         List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -177,7 +177,8 @@
 
         <result property="boardNum" column="boardNum"/>
         <result property="plateNum" column="plateNum"/>
-        <result property="texture" column="texture"/>
+        <result property="hasTexture" column="hasTexture"/>
+        <result property="boardId" column="boardId"/>
         <result property="plateName" column="plateName"/>
         <result property="material" column="material"/>
         <result property="color" column="color"/>
@@ -192,7 +193,10 @@
 
         select count(distinct og.id) as boardNum,
                count(distinct op.id) as plateNum,
-               op.texture as texture,
+               (case
+                    when p.texture ='' then  false
+                    else  true end ) as hasTexture,
+               og.id as boardId,
                og.goods_name as plateName,
                og.material as material,
                og.color as color,
@@ -204,7 +208,7 @@
                  left join plate p on og.goods_id = p.id
                  left join order_remain_plate orp on op.id = orp.plan_id
         where og.order_id = #{orderId}
-        group by plateName,material,color,thickness,spec,remainPlateNum,texture;
+        group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture;
 
     </select>
 
@@ -215,7 +219,10 @@
 
         select count(distinct og.id) as boardNum,
                count(distinct op.id) as plateNum,
-               op.texture as texture,
+               (case
+                    when p.texture ='' then  false
+                    else  true end ) as hasTexture,
+               og.id as boardId,
                og.goods_name as plateName,
                og.material as material,
                og.color as color,
@@ -232,7 +239,7 @@
             #{orderIds}
         </foreach>
 
-        group by plateName,material,color,thickness,spec,remainPlateNum,texture;
+        group by boardId,plateName,material,color,thickness,spec,remainPlateNum,hasTexture;
 
     </select>