Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -947,4 +947,13 @@ public class SaveConstans {
 
         public static final String ISSUES_EMAIL_TITLE ="生产问题审批超时提醒";
     }
+
+    /**
+     * 保养检修任务
+     */
+    public static class EquMaintenanceTask {
+
+        //计划分类- 常规计划
+        public static final String PLANCLASSIFICATION_CONVENTIONALPLAN = "01";
+    }
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -32,6 +32,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.rongwei.safecommon.utils.SaveConstans.EquMaintenanceTask.PLANCLASSIFICATION_CONVENTIONALPLAN;
+
 /**
  * @author shangmi
  * @title MaintenanceServiceImpl
@@ -456,6 +458,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
                     .setCreatedate(newDate)
                     .setModifydate(newDate)
+                    .setPLANCLASSIFICATION(PLANCLASSIFICATION_CONVENTIONALPLAN)
                     .setTenantid(maintenanceSchedule.getTenantid());
             if ("200".equals(serialNumberCode.getCode())) {
                 Object data = serialNumberCode.getData();

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquMaintenanceTaskDo.java

@@ -415,4 +415,9 @@ public class EquMaintenanceTaskDo implements Serializable {
 	 */
 	private String returnmark;
 
+	/**
+	 * 计划分类
+	 */
+	private String PLANCLASSIFICATION;
+
 }