码格式，码库，箱码幅面增加is_sys是否系统初始化字段

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrBoxCodeFormat.java

@@ -66,5 +66,11 @@ public class QrBoxCodeFormat {
     @ApiModelProperty(value = "是否删除")
     private Integer isDelete;
 
+    @ApiModelProperty("1-是系统初始化 0-手工创建")
+    private Integer isSys;
+
+    @ApiModelProperty("1-盖码默认幅面 ")
+    private Integer sysType;
+
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrFormat.java

@@ -81,4 +81,7 @@ public class QrFormat {
     @ApiModelProperty("是否删除")
     private Integer isDelete;
 
+    @ApiModelProperty("1-是系统初始化 0-手工创建")
+    private Integer isSys;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrRepertory.java

@@ -55,4 +55,7 @@ public class QrRepertory {
 	@ApiModelProperty("是否删除")
 	private Integer isDelete;
 
+	@ApiModelProperty("1-是系统初始化 0-手工创建")
+	private Integer isSys;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrFormatServiceImpl.java

@@ -242,6 +242,9 @@ public class QrFormatServiceImpl implements QrFormatService {
         qrFormatMapper.updateById(update);
     }
 
+    /**
+     * 码格式下拉列表
+     */
     @Override
     public ListFormatSelectRes listFormatSelect() {
 
@@ -250,6 +253,7 @@ public class QrFormatServiceImpl implements QrFormatService {
         QueryWrapper<QrFormat> qw = new QueryWrapper<>();
         qw.eq("unique_status", QrFormatUniqueStatusEunm.VERIFY_FAIL.getCode());
         qw.eq("is_delete", 0);
+        qw.eq("is_sys",0);
         List<QrFormat> formatList = qrFormatMapper.selectList(qw);
         List<ListFormatSelectRes.FormatBean> beanList = PojoConverterUtils.copyList(formatList, ListFormatSelectRes.FormatBean.class);
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrRepertoryServiceImpl.java

@@ -252,6 +252,10 @@ public class QrRepertoryServiceImpl implements QrRepertoryService {
         qrRepertoryColumnMapper.deleteByQrRepertoryId(req.getId());
     }
 
+
+    /**
+     * 查询码库下拉列表
+     */
     @Override
     public ListQrRepertorySelectRes listQrRepertorySelectRes() {
 
@@ -259,12 +263,16 @@ public class QrRepertoryServiceImpl implements QrRepertoryService {
 
         QueryWrapper<QrRepertory> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", 0);
+        queryWrapper.eq("is_sys",0);
         List<QrRepertory> repertoryList = qrRepertoryMapper.selectList(queryWrapper);
         List<ListQrRepertorySelectRes.QrRepertoryBean> beanList = PojoConverterUtils.copyList(repertoryList, ListQrRepertorySelectRes.QrRepertoryBean.class);
         res.setQrRepertoryBeanList(beanList);
         return res;
     }
 
+    /**
+     * 查询码库下拉列表
+     */
     @Override
     public ListQrRepertorySelectDetailRes listQrRepertorySelectDetail(ListQrRepertorySelectDetailReq req) {
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxCodeFormatMapper.xml

@@ -18,11 +18,13 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_time" property="updateTime"/>
         <result column="is_delete" property="isDelete"/>
+        <result property="isSys" column="is_sys"/>
+        <result property="sysType" column="sys_type"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,name,dept_id,qr_repertory_id,factory_id,color_per_roll_scalar,format_number,remark,state,create_by,create_time,update_by,update_time,is_delete
+        id,name,dept_id,qr_repertory_id,factory_id,color_per_roll_scalar,format_number,remark,state,create_by,create_time,update_by,update_time,is_delete,is_sys,sys_type
     </sql>
 
     <select id="listBoxCodeFormat" resultType="com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO">
@@ -33,6 +35,7 @@
         left join base_factory bf on bf.id=bcf.factory_id
         <where>
             bcf.is_delete = 0
+            AND bcf.is_sys = 0
             <if test="param.factoryId != null">
                 AND bf.id = #{param.factoryId}
             </if>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrFormatMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="isDelete" column="is_delete"/>
+        <result property="isSys" column="is_sys"/>
     </resultMap>
 
 	<update id="updateUseStatusByIds">
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN user_info ui ON qf.update_by = ui.id
         <where>
             qf.is_delete = 0
+            AND qf.is_sys = 0
             <if test="param.name != null and param.name != ''">
                 AND qf.name LIKE CONCAT('%',#{param.name},'%')
             </if>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertoryMapper.xml

@@ -15,6 +15,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="isDelete" column="is_delete"/>
+        <result property="isSys" column="is_sys"/>
     </resultMap>
 
     <!-- 码库的列 -->
@@ -83,6 +84,7 @@
         LEFT JOIN user_info ui ON qr.update_by = ui.id
         <where>
             qr.is_delete = 0
+            AND qr.is_sys = 0
             <if test="param.name != null and param.name != ''">
                 AND qr.name LIKE CONCAT('%',#{param.name},'%')
             </if>
@@ -161,6 +163,8 @@
         inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
         inner join qr_box_code_format_split qbs on qrc.id = qbs.qr_repertory_column_id
         <where>
+            qr.is_delete = 0
+            AND qr.is_sys = 0
             <if test="id != null and id != ''">
                 qr.id = #{id}
             </if>