feature 排程备份功能 备份 警告和冲突信息

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquBackupDao.xml

@@ -54,7 +54,7 @@
         REPORTROLL,CHECKOUTROLL,UNFINISHROLL,
         WORKSTATUS,BACHMATERIALPROCESS,WAITREPORTID,
         LOCKMARK,BLANKID,BACKUPUSER,
-        BACKUPUSERID,BACKUPDATE
+        BACKUPUSERID,BACKUPDATE,HASCONFLICT,CONFLICTDES,SOFTCONFLICTDES
     </sql>
     <insert id="processOperationEquBackup">
         <if test="equDos != null and equDos.size() >0">
@@ -70,7 +70,8 @@
                 #{data.closestatus},#{data.planprocessrall},#{data.startingroll},
                 #{data.reportroll},#{data.checkoutroll},#{data.unfinishroll},
                 #{data.workstatus},#{data.bachmaterialprocess},#{data.waitreportid},
-                #{data.lockmark},#{data.blankid},#{userName} ,#{userId} ,NOW())
+                #{data.lockmark},#{data.blankid},#{userName} ,#{userId} ,NOW()),
+                #{data.hasconflict},#{data.conflictdes},#{data.softconflictdes}
                 ON DUPLICATE KEY UPDATE DELETED='0'
             </foreach>
         </if>

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquBackupDo.java

@@ -11,147 +11,133 @@ import java.util.Date;
 
 /**
  * 生产订单-坯料计划-工序作业加工设备
+ *
  * @TableName aps_process_operation_process_equ_backup
  */
-@TableName(value ="aps_process_operation_process_equ_backup")
+@TableName(value = "aps_process_operation_process_equ_backup")
 @Data
 public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Serializable {
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
     /**
      * 主键ID
      */
     @TableId
     private String id;
-
     /**
-     * 
+     *
      */
     private String tenantid;
-
     /**
      * 扩展json格式配置
      */
     private String roption;
-
     /**
      * 所属工厂
      */
     private String ownedfactory;
-
     /**
      * 工序作业ID
      */
     private String processid;
-
     /**
      * 加工车间ID
      */
     private String processworkshopid;
-
     /**
      * 加工车间
      */
     private String processworkshop;
-
     /**
      * 加工设备ID
      */
     private String processdeviceid;
-
     /**
      * 加工设备
      */
     private String processdevice;
-
     /**
      * 计划开工时间
      */
     private Date planstartdate;
-
     /**
      * 实际开工时间
      */
     private Date actualstartdate;
-
     /**
      * 计划完工时间
      */
     private Date planenddate;
-
     /**
      * 实际完工时间
      */
     private Date actualfinishdate;
-
     /**
      * 完工状态
      */
     private String closestatus;
-
     /**
      * 计划加工卷数
      */
     private Integer planprocessrall;
-
     /**
      * 已开工卷数
      */
     private Integer startingroll;
-
     /**
      * 已报工卷数
      */
     private Integer reportroll;
-
     /**
      * 已检验卷数
      */
     private Integer checkoutroll;
-
     /**
      * 未完工卷数
      */
     private Integer unfinishroll;
-
     /**
      * 作业状态
      */
     private String workstatus;
-
     /**
      * 待加工料卷批次号
      */
     private String bachmaterialprocess;
-
     /**
      * 待报工记录ID
      */
     private String waitreportid;
-
     /**
      * 是否锁定 y：锁定，n：未锁定
      */
     private String lockmark;
-
     /**
      * 坯料计划ID
      */
     private String blankid;
-
     /**
      * 备份人姓名
      */
     private String backupuser;
-
     /**
      * 备份人姓名ID
      */
     private String backupuserid;
-
     /**
      * 备份日期
      */
     private Date backupdate;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
+    /**
+     * 是否冲突（y：是，n：否）
+     */
+    private String hasconflict;
+    /**
+     * 强制冲突描述
+     */
+    private String conflictdes;
+    /**
+     * 非强制冲突描述(警告)
+     */
+    private String softconflictdes;
 }