分堆打包Bug修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/GroupNameList.java

@@ -0,0 +1,16 @@
+package com.cf.imes.module.manage.controller.admin.pack.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+
+@Schema(description = "工序组名称")
+@Data
+public class GroupNameList {
+
+    @Schema(description = "工序组名称")
+    private String name;
+
+}

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java

@@ -6,6 +6,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 
 @Schema(description = "管理后台 - 板材详情(导出板材表) Response VO")
 @Data
@@ -89,4 +93,7 @@ public class PlateDetailsRespVO {
     private String remark;
 
 
+    @Schema(description = "加工组名称集合")
+    private List<GroupNameList> processGroupNameList;
+
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java

@@ -1,9 +1,12 @@
 package com.cf.imes.module.manage.controller.admin.query.vo.pack;
 
 
+import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 包裹详情 Response VO")
 @Data
 public class PackageDetailsRespVO {
@@ -66,6 +69,9 @@ public class PackageDetailsRespVO {
     private String remark;
 
 
+    @Schema(description = "加工组名称集合")
+    private List<GroupNameList> processGroupNameList;
+
 
 
     @Schema(description = "配件名称-配件类型显示", requiredMode = Schema.RequiredMode.REQUIRED)

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
 
 
-    IPage<PackageDetailsRespVO> selectByPackageId( @Param("page") IPage page, @Param("packageId")  Long packageId, @Param("organId")  Long organId);
+    List<PackageDetailsRespVO> selectByPackageId( @Param("packageId")  Long packageId, @Param("organId")  Long organId);
 
 
     List<OrderModuleVO> selectCombinationName(Long orderNo);

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -127,6 +127,18 @@ public class PackServiceImpl implements PackService {
         // 查询订单对应的板件信息
         List<PlateDetailsRespVO> plateDetailsRespVOS = orderItemMapper.selectOrderPlateList(orderId,getUserOrganId());
 
+        for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) {
+            String name = "";
+            for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
+                // 去除最后的逗号
+                name += groupNameList.getName()+",";
+
+            }
+            name = name.substring(0, name.length() - 1);
+
+            plateDetailsRespVO.setProcessGroup(name);
+        }
+
         return plateDetailsRespVOS;
 
 
@@ -137,7 +149,23 @@ public class PackServiceImpl implements PackService {
     @Override
     public List<PlateDetailsRespVO> getOrdersPlateList(List<Long> orderIds) {
 
-        return orderItemMapper.selectOrdersPlateList(orderIds,getUserOrganId());
+
+        List<PlateDetailsRespVO> plateDetailsRespVOS = orderItemMapper.selectOrdersPlateList(orderIds, getUserOrganId());
+
+        for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) {
+            String name = "";
+            for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
+                // 去除最后的逗号
+                name += groupNameList.getName()+",";
+
+            }
+            name = name.substring(0, name.length() - 1);
+
+            plateDetailsRespVO.setProcessGroup(name);
+        }
+
+        return plateDetailsRespVOS;
+
 
     }
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java

@@ -3,10 +3,12 @@ package com.cf.imes.module.manage.service.query;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cf.imes.framework.common.enums.OrderPackageTypeEnum;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList;
 import com.cf.imes.module.manage.controller.admin.pack.vo.OrderPartsReqVO;
 import com.cf.imes.module.manage.controller.admin.pack.vo.PackDetailsReqVO;
 import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO;
@@ -196,17 +198,31 @@ public class ProductionStatusServiceImpl implements ProductionStatusService {
         }
 
 
-
         // 查看板材包裹
-        IPage<PackageDetailsRespVO> packageDetailsRespVOS = orderItemMapper.selectByPackageId(page,reqVO.getPackageId(),getUserOrganId());
+        List<PackageDetailsRespVO> packageDetailsRespVOS = orderItemMapper.selectByPackageId(reqVO.getPackageId(),getUserOrganId());
 
 
-        if (CollectionUtil.isEmpty(packageDetailsRespVOS.getRecords())) {
+        for (PackageDetailsRespVO plateDetailsRespVO : packageDetailsRespVOS) {
+            String name = "";
+            for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
+                // 去除最后的逗号
+                name += groupNameList.getName()+",";
+
+            }
+            name = name.substring(0, name.length() - 1);
+
+            plateDetailsRespVO.setProcessGroup(name);
+        }
+
+        Page<PackageDetailsRespVO> packageDetailsRespVOPage = page.setRecords(packageDetailsRespVOS);
+
+
+        if (CollectionUtil.isEmpty(packageDetailsRespVOPage.getRecords())) {
             return new PageResult<>();
         }
 
 
-        return new PageResult<>(packageDetailsRespVOS.getRecords(), packageDetailsRespVOS.getTotal());
+        return new PageResult<>(packageDetailsRespVOPage.getRecords(), packageDetailsRespVOPage.getTotal());
 
     }
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml

@@ -100,8 +100,7 @@
         op.remark as remark,
         op.is_special_shaped as specialShaped,
         op.is_sculpt as profiling,
-
+        op.is_row_hole AS rowHole
-        CASE WHEN op.front_hole_count = 0 or op.back_model_count = 0  or op.side_hole_count = 0  THEN false ELSE true END AS rowHole
 
         from order_plate op
         join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml

@@ -21,7 +21,10 @@
         <result property="profiling" column="profiling"/>
         <result property="rowHole" column="rowHole"/>
         <result property="remark" column="remark"/>
-        <result property="processGroup" column="name"/>
+
+        <collection property="processGroupNameList" javaType="java.util.List"  ofType="com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList">
+            <result property="name" column="name"/>
+        </collection>
     </resultMap>
 
 
@@ -132,7 +135,11 @@
         <result property="profiling" column="profiling"/>
         <result property="rowHole" column="rowHole"/>
         <result property="remark" column="remark"/>
-        <result property="processGroup" column="name"/>
+
+        <collection property="processGroupNameList" javaType="java.util.List"  ofType="com.cf.imes.module.manage.controller.admin.pack.vo.GroupNameList">
+            <result property="name" column="name"/>
+        </collection>
+
     </resultMap>
     <select id="selectOrderPlateList"
             parameterType="java.lang.Long"