分堆打包Bug修改-2.0

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

@@ -52,14 +52,14 @@ public class PackageDetailsRespVO {
     @Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED)
     private String texture;
 
-    @Schema(description = "异形数量", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否异型", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String specialShaped;
+    private Boolean specialShaped;
 
-    @Schema(description = "造型数量", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String profiling;
+    private Boolean profiling;
 
-    @Schema(description = "排孔数量", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String rowHole;
+    private Boolean rowHole;
 
     @Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED)
     private String processGroup;

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

@@ -129,13 +129,14 @@ public class PackServiceImpl implements PackService {
 
         for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) {
             String name = "";
+            if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) {
                 for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
                     // 去除最后的逗号
                     name += groupNameList.getName() + ",";
 
                 }
                 name = name.substring(0, name.length() - 1);
-
+            }
             plateDetailsRespVO.setProcessGroup(name);
         }
 
@@ -154,13 +155,13 @@ public class PackServiceImpl implements PackService {
 
         for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) {
             String name = "";
+            if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) {
                 for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
                     // 去除最后的逗号
                     name += groupNameList.getName() + ",";
-
                 }
                 name = name.substring(0, name.length() - 1);
-
+            }
             plateDetailsRespVO.setProcessGroup(name);
         }
 

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

@@ -204,12 +204,14 @@ public class ProductionStatusServiceImpl implements ProductionStatusService {
 
         for (PackageDetailsRespVO plateDetailsRespVO : packageDetailsRespVOS) {
             String name = "";
+
+            if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) {
                 for (GroupNameList groupNameList : plateDetailsRespVO.getProcessGroupNameList()) {
                     // 去除最后的逗号
                     name += groupNameList.getName() + ",";
-
                 }
                 name = name.substring(0, name.length() - 1);
+            }
 
             plateDetailsRespVO.setProcessGroup(name);
         }