码包删除部门字段，添加包材厂，并添加对应的关联关系

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BoxCodeFormatController.java

@@ -15,7 +15,6 @@ import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;

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

@@ -25,8 +25,8 @@ public class QrPackage implements Serializable {
 	@ApiModelProperty("码包id")
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
+	@ApiModelProperty(value = "包材厂id")
+	private Long factoryId;
 
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;

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

@@ -22,11 +22,11 @@ public class QrPackageVO implements Serializable {
 	@ApiModelProperty("码包id")
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
+	@ApiModelProperty(value = "包材厂id")
+	private Long factoryId;
 
-	@ApiModelProperty("部门名称")
-	private String deptName;
+	@ApiModelProperty("包材厂名称")
+	private String factoryName;
 
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;

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

@@ -23,8 +23,8 @@ public class ListQrPackageReq extends PageReq implements Serializable {
 	@ApiModelProperty("码库类型")
 	private Integer qrRepertoryType;
 
-	@ApiModelProperty("部门名称")
-	private String deptName;
+	@ApiModelProperty(value = "包材厂id")
+	private Long factoryId;
 
 	@ApiModelProperty("箱码幅面/码库名称")
 	private String boxCodeFormatOrQrRepertoryName;

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

@@ -21,9 +21,9 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty("码包id")
 	private Long id;
 
-	@NotNull(message = "部门为空")
-	@ApiModelProperty("部门id")
-	private Long deptId;
+	@NotNull(message = "包材厂为空")
+	@ApiModelProperty(value = "包材厂id")
+	private Long factoryId;
 
 	@NotNull(message = "箱码幅面为空")
 	@ApiModelProperty("箱码幅面id")

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

@@ -23,11 +23,11 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty("码包id")
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
+	@ApiModelProperty(value = "包材厂id")
+	private Long factoryId;
 
-	@ApiModelProperty("部门名称")
-	private String deptName;
+	@ApiModelProperty("包材厂名称")
+	private String factoryName;
 
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;

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

@@ -39,11 +39,11 @@ public class ListQrPackageRes extends PageResp implements Serializable {
 		@ApiModelProperty("码包id")
 		private Long id;
 
-		@ApiModelProperty("部门id")
-		private Long deptId;
+		@ApiModelProperty(value = "包材厂id")
+		private Long factoryId;
 
-		@ApiModelProperty("部门名称")
-		private String deptName;
+		@ApiModelProperty("包材厂名称")
+		private String factoryName;
 
 		@ApiModelProperty("箱码幅面id")
 		private Long boxCodeFormatId;

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.abi.qms.platform.dao.vo.result.QrPackageVO" id="QrPackageResult">
         <result property="id" column="id"/>
-        <result property="deptId" column="dept_id"/>
+        <result property="factoryId" column="factory_id"/>
         <result property="boxCodeFormatId" column="box_code_format_id"/>
         <result property="batchNumber" column="batch_number"/>
         <result property="name" column="name"/>
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <!-- 部门 -->
-        <result property="deptName" column="dept_name"/>
+        <result property="factoryName" column="factory_name"/>
         <!-- 码库 -->
         <result property="qrRepertoryId" column="qr_Repertory_id"/>
         <result property="qrRepertoryName" column="qr_repertory_name"/>
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listQrPackage" resultType="com.abi.qms.platform.dao.vo.result.QrPackageVO">
         SELECT
             qp.id,
-            qp.dept_id,
+            qp.factory_id,
             qp.box_code_format_id,
             qp.batch_number,
             qp.name,
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qp.create_by,
             qp.update_time,
             qp.update_by,
-            bd.dept_name,
+            bf.factory_name,
             bcf.name AS box_code_format_name,
             qr.id AS qr_repertory_id,
             qr.name AS qr_repertory_name,
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qr_package qp
         LEFT JOIN box_code_format bcf ON qp.box_code_format_id = bcf.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 base_factory bf ON qp.factory_id = bf.id
         LEFT JOIN user_info ui ON qp.create_by = ui.id
         <where>
             qp.is_delete = 0
@@ -66,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="param.qrRepertoryType != null">
                 AND qr.type = #{param.qrRepertoryType}
             </if>
-            <if test="param.deptName != null and param.deptName != ''">
-                AND bd.dept_name LIKE CONCAT('%',#{param.deptName},'%')
+            <if test="param.factoryId != null">
+                AND qp.factory_id = #{param.factoryId}
             </if>
             <if test="param.boxCodeFormatOrQrRepertoryName != null and param.boxCodeFormatOrQrRepertoryName != ''">
                 AND ( qr.name LIKE CONCAT('%',#{param.boxCodeFormatOrQrRepertoryName},'%') OR bcf.name LIKE CONCAT('%',#{param.boxCodeFormatOrQrRepertoryName},'%') )
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQrPackageDetailById" resultMap="QrPackageResult">
         SELECT
             qp.id,
-            qp.dept_id,
+            qp.factory_id,
             qp.box_code_format_id,
             qp.batch_number,
             qp.name,
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qp.create_by,
             qp.update_time,
             qp.update_by,
-            bd.dept_name,
+            bf.factory_name,
             qr.id AS qr_Repertory_id,
             qr.name AS qr_repertory_name,
             qr.type AS qr_repertory_type,
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qr_package qp
         LEFT JOIN box_code_format bcf ON qp.box_code_format_id = bcf.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 base_factory bf ON qp.factory_id = bf.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
         WHERE qp.id = #{id}