bug修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/Detail.java

@@ -18,14 +18,21 @@ import java.util.List;
 @NoArgsConstructor
 @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问
 public class Detail {
+//    柜体成倍拆单数据
     private Integer multiNum;
 //    柜体 长 宽 深
     private Double width;
     private Double height;
     private Double depth;
 
-//    板件和配件基本属性信息，通过goodType进行区分
+//    板材所属加工组
-    private IBoardProdInfo iBoardProdInfo;
+    private List<String> group;// 板件加工组Group的名称,可以有多个
+    private String groupName;// 加工组中Group中每个小加工组的名称
+
+//    大板信息
+    private IBoardProdInfo plateInfo;
+//    配件信息
+    private List<IBoardProdInfo> partsInfo ;
 
     private List<ModelDetail> contourDetail ; //轮廓明细
     private List<PointDetail> pointDetail ; //点明细

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/group.java

@@ -0,0 +1,24 @@
+package com.cf.imes.module.executor.util.deviseData;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 加工组信息
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class group
+{
+    private String name;
+
+    private Double width;
+
+    private Double height;
+    
+    private Double depth;
+}

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -180,6 +180,7 @@ public interface ErrorCodeConstants {
     //=========== 工序信息 1-002-028-000 ============
     ErrorCode PROCESS_NOT_EXISTS = new ErrorCode(1_002_028_000, "工序不存在");
     ErrorCode PROCESS_ID_IS_NULL = new ErrorCode(1_002_028_000, "工序ID填写错误不存在");
+    ErrorCode PROCESS_STATUS_DISABLE = new ErrorCode(1_002_028_000, "工序状态以已禁用");
 
     //=========== 工序组信息 1-002-029-000 ============
     ErrorCode PROCESS_GROUP_NOT_EXISTS = new ErrorCode(1_002_029_000, "工序组不存在");

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java

@@ -83,6 +83,8 @@ public class ProcessServiceImpl implements ProcessService {
     public void updateProcess(ProcessUserSaveReqVO updateReqVO) {
         // 校验存在
         validateProcessExists(updateReqVO.getId());
+        // 校验状态
+        validateProcessStatus(updateReqVO.getId());
         ProcessDO updateProcess = BeanUtils.toBean(updateReqVO, ProcessDO.class);
 
         processUserService.deleteProcessUserByProcess(updateReqVO.getId());
@@ -123,6 +125,13 @@ public class ProcessServiceImpl implements ProcessService {
         }
     }
 
+    private void validateProcessStatus(Long id) {
+        ProcessDO process = processMapper.selectById(id);
+        if (process != null && process.getIsEnabled() == Boolean.FALSE) {
+            throw exception(PROCESS_STATUS_DISABLE);
+        }
+    }
+
     @Override
     public ProcessUserRespVO getProcess(Long id) {
         // 校验存在