箱码幅面关联码库表字段code_store_id修改成qr_repertory_id，并修改应用的地方

添加箱码幅面与码库的关联关系

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

@@ -30,7 +30,7 @@ public class BoxCodeFormat {
     private Long deptId;
 
     @ApiModelProperty(value = "码库id")
-    private Long codeStoreId;
+    private Long qrRepertoryId;
 
     @ApiModelProperty(value = "供应商id")
     private Long factoryId;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/BoxCodeFormatVO.java

@@ -21,7 +21,7 @@ public class BoxCodeFormatVO implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "码库id")
-    private Long codeStoreId;
+    private Long qrRepertoryId;
 
     @ApiModelProperty(value = "供应商id")
     private Long factoryId;
@@ -30,7 +30,7 @@ public class BoxCodeFormatVO implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "码库名称")
-    private String codeStoreName;
+    private String qrRepertoryName;
 
     @ApiModelProperty(value = "供应商名称")
     private String factoryName;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveBoxCodeFormatReq.java

@@ -21,13 +21,10 @@ public class SaveBoxCodeFormatReq implements Serializable {
     @ApiModelProperty(value = "箱码幅面名称")
     private String name;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
     @ApiModelProperty(value = "码库id")
-    private Long codeStoreId;
+    private Long qrRepertoryId;
 
-    @ApiModelProperty(value = "供应商id")
+    @ApiModelProperty(value = "包材厂id")
     private Long factoryId;
 
     @ApiModelProperty(value = "每卷色标量")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/BoxCodeFormatDetailRes.java

@@ -21,7 +21,7 @@ public class BoxCodeFormatDetailRes implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "码库id")
-    private Long codeStoreId;
+    private Long qrRepertoryId;
 
     @ApiModelProperty(value = "包材厂id")
     private Long factoryId;
@@ -30,7 +30,7 @@ public class BoxCodeFormatDetailRes implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "码库名称")
-    private String codeStoreName;
+    private String qrRepertoryName;
 
     @ApiModelProperty(value = "包材厂名称")
     private String factoryName;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListBoxCodeFormatRes.java

@@ -42,7 +42,7 @@ public class ListBoxCodeFormatRes extends PageResp implements Serializable {
         private String name;
 
         @ApiModelProperty(value = "码库名称")
-        private String codeStoreName;
+        private String qrRepertoryName;
 
         @ApiModelProperty(value = "包材厂名称")
         private String factoryName;

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

@@ -14,6 +14,7 @@ import com.abi.qms.platform.dto.res.BoxCodeFormatDetailRes;
 import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
+import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.BoxCodeFormatService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
@@ -50,9 +51,9 @@ public class BoxCodeFormatImpl implements BoxCodeFormatService {
         }
 
         //2-放入数据
-        boxCodeFormat.setDeptId(req.getDeptId());
-        boxCodeFormat.setCodeStoreId(req.getCodeStoreId());
-        boxCodeFormat.setFactoryId(req.getFactoryId());
+        boxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
+        //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
+        boxCodeFormat.setFactoryId(UserUtil.getUser().getFactoryId() != null ? UserUtil.getUser().getFactoryId() : req.getFactoryId());
         boxCodeFormat.setName(req.getName());
         boxCodeFormat.setColorPerRollScalar(req.getColorPerRollScalar());
         boxCodeFormat.setFormatNumber(req.getFormatNumber());

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

@@ -7,7 +7,7 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="dept_id" property="deptId"/>
-        <result column="code_store_id" property="codeStoreId"/>
+        <result column="qr_repertory_id" property="qrRepertoryId"/>
         <result column="factory_id" property="factoryId"/>
         <result column="color_per_roll_scalar" property="colorPerRollScalar"/>
         <result column="format_number" property="formatNumber"/>
@@ -22,13 +22,14 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,name,dept_id,code_store_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
     </sql>
 
     <select id="listBoxCodeFormat" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
-        bcf.state,bcf.update_time,bf.factory_name
+        bcf.state,bcf.update_time,bf.factory_name, bcf.qr_repertory_id, qr.name qrRepertoryName
         from box_code_format bcf
+        left join qr_repertory qr on bcf.qr_repertory_id=qr.id
         left join base_factory bf on bf.id=bcf.factory_id
         <where>
             bcf.is_delete = 0
@@ -47,8 +48,9 @@
 
     <select id="selectBoxCodeFormatDetailById" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
-        bcf.state,bcf.update_time,bf.factory_name,bcf.dept_id,bcf.code_store_id,bcf.factory_id
+        bcf.state,bcf.update_time,bf.factory_name,bcf.dept_id,bcf.qr_repertory_id,bcf.factory_id, bcf.qr_repertory_id, qr.name qrRepertoryName
         from box_code_format bcf
+        left join qr_repertory qr on bcf.qr_repertory_id=qr.id
         left join base_factory bf on bf.id=bcf.factory_id
         where bcf.id = #{id} and bcf.is_delete = 0
     </select>

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             qr_package qp
         LEFT JOIN box_code_format bcf ON qp.box_code_format_id = bcf.id
-        LEFT JOIN qr_repertory qr ON bcf.code_store_id = qr.id
+        LEFT JOIN qr_repertory qr ON bcf.qr_repertory_id = qr.id
         LEFT JOIN base_department bd ON qp.dept_id = bd.id
         LEFT JOIN user_info ui ON qp.create_by = ui.id
         <where>
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             qr_package qp
         LEFT JOIN box_code_format bcf ON qp.box_code_format_id = bcf.id
-        LEFT JOIN qr_repertory qr ON bcf.code_store_id = qr.id
+        LEFT JOIN qr_repertory qr ON bcf.qr_repertory_id = qr.id
         LEFT JOIN base_department bd ON qp.dept_id = bd.id
         LEFT JOIN qr_package_download_record qpdr ON qpdr.qr_package_id = qp.id
         LEFT JOIN user_info ui ON ui.id = qpdr.create_by

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

@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN qr_repertory_column qrc ON qrc.qr_repertory_id = qr.id
         LEFT JOIN qr_format qf ON qf.id = qrc.qr_format_id
         LEFT JOIN base_department bd ON qr.dept_id = bd.id
-        LEFT JOIN box_code_format bcf ON bcf.code_store_id = qr.id
+        LEFT JOIN box_code_format bcf ON bcf.qr_repertory_id = qr.id
         LEFT JOIN qr_package qp ON qp.box_code_format_id = bcf.id
         LEFT JOIN user_info ui ON ui.id = qp.create_by
         WHERE qr.id = #{id} AND qrc.is_delete = 0