码包添加包材厂，啤酒厂，备用码包，申请原因字段及相关映射实体

码包删除部门id，码包名称，批次号及相关映射实体

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

@@ -24,14 +24,14 @@ public class QrPackage implements Serializable {
 	@Schema(name = "码包id")
 	private Long id;
 
-	@Schema(name = "部门id")
-	private Long deptId;
+	@Schema(name = "包材厂id")
+	private Long factoryCoverId;
 
 	@Schema(name = "物料id")
 	private Long materialId;
 
-	@Schema(name = "包材厂id")
-	private Long factoryId;
+	@Schema(name = "啤酒厂id")
+	private Long factoryBeerId;
 
 	@Schema(name = "箱码幅面id")
 	private Long boxCodeFormatId;
@@ -39,15 +39,15 @@ public class QrPackage implements Serializable {
 	@Schema(name = "SAP单号")
 	private String sapOrderNo;
 
-	@Schema(name = "批次号")
-	private String batchNumber;
-
-	@Schema(name = "码包名称")
-	private String name;
+	@Schema(name = "备用码包")
+	private String standbyRatio;
 
 	@Schema(name = "码数量")
 	private Long qrNumber;
 
+	@Schema(name = "申请原因")
+	private String reasonApply;
+
 	@Schema(name = "申请状态 0-待审核 1-审核通过 2-审核拒绝")
 	private Integer applyStatus;
 

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

@@ -29,10 +29,19 @@ public class QrPackageVO implements Serializable {
 	private String materialName;
 
 	@ApiModelProperty(value = "包材厂id")
-	private Long factoryId;
+	private Long factoryCoverId;
 
 	@ApiModelProperty("包材厂名称")
-	private String factoryName;
+	private String factoryCoverName;
+
+	@ApiModelProperty(value = "啤酒厂id")
+	private Long factoryBeerId;
+
+	@ApiModelProperty("啤酒厂名称")
+	private String factoryBeerName;
+
+	@ApiModelProperty(value = "备用码包")
+	private String standbyRatio;
 
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;
@@ -52,12 +61,6 @@ public class QrPackageVO implements Serializable {
 	@ApiModelProperty("SAP单号")
 	private String sapOrderNo;
 
-	@ApiModelProperty("批次号")
-	private String batchNumber;
-
-	@ApiModelProperty("码包名称")
-	private String name;
-
 	@ApiModelProperty("码数量")
 	private Long qrNumber;
 
@@ -67,6 +70,9 @@ public class QrPackageVO implements Serializable {
 	@ApiModelProperty("生成状态 0-未生成 1-生成中 2-已生成 3-失败")
 	private Integer generateStatus;
 
+	@ApiModelProperty(value = "申请原因")
+	private String reasonApply;
+
 	@ApiModelProperty("下载路径")
 	private String downloadPath;
 

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

@@ -27,7 +27,7 @@ public class ListQrPackageReq extends PageReq implements Serializable {
 	private Long materialId;
 
 	@ApiModelProperty(value = "包材厂id")
-	private Long factoryId;
+	private Long factoryCoverId;
 
 	@ApiModelProperty("申请状态 0-待审核 1-审核通过 2-审核拒绝")
 	private Integer applyStatus;

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

@@ -1,12 +1,20 @@
 package com.abi.qms.platform.dto.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 码包新增修改入参
@@ -21,21 +29,58 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty("码包id")
 	private Long id;
 
+	@NotEmpty(message = "SAP单号为空")
+	@Size(max = 20, message = "SAP单号不能超过20字")
+	@ApiModelProperty("SAP单号")
+	private String sapOrderNo;
+
+	@NotNull(message = "物料名称为空")
+	@ApiModelProperty(value = "物料id")
+	private Long materialId;
+
 	@NotNull(message = "包材厂为空")
 	@ApiModelProperty(value = "包材厂id")
-	private Long factoryId;
+	private Long factoryCoverId;
+
+	@NotNull(message = "啤酒厂为空")
+	@ApiModelProperty(value = "啤酒厂id")
+	private Long factoryBeerId;
 
 	@NotNull(message = "箱码幅面为空")
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;
 
-	@NotNull(message = "码包名称为空")
-	@Pattern(regexp = "^[a-zA-Z-z0-9\\u4e00-\\u9fa5]{1,20}$", message = "码包名称限制20字内的汉字or字母or数字")
-	@ApiModelProperty("码包名称")
-	private String name;
+	@NotEmpty(message = "备用码包为空")
+	@ApiModelProperty(value = "备用码包")
+	private String standbyRatio;
 
 	@NotNull(message = "码数量为空")
 	@ApiModelProperty("码数量")
 	private Long qrNumber;
 
+	@Size(max = 50, message = "申请原因超过50字")
+	@ApiModelProperty(value = "申请原因")
+	private String reasonApply;
+
+	@ApiModelProperty(value = "批次列表")
+	private List<PackageBatchBean> packageBatchBeanList;
+
+	/**
+	 * 批次号bean
+	 */
+	@Data
+	@NoArgsConstructor
+	@AllArgsConstructor
+	@ToString
+	@ApiModel(value = "SaveQrPackageReq_PackageBatchBean")
+	public static class PackageBatchBean implements Serializable {
+
+		@NotEmpty(message = "批次号为空")
+		@ApiModelProperty(value = "批次号")
+		private String batchNumber;
+
+		@NotNull(message = "批次内码数量为空")
+		@ApiModelProperty(value = "批次内码数量")
+		private Long batchQrNumber;
+	}
 }

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

@@ -60,9 +60,6 @@ public class ListQrPackageRes extends PageResp implements Serializable {
 		@ApiModelProperty("箱码幅面名称")
 		private String boxCodeFormatName;
 
-		@ApiModelProperty("码包名称")
-		private String name;
-
 		@ApiModelProperty("码数量")
 		private Long qrNumber;
 

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

@@ -7,11 +7,12 @@ 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="materialId" column="material_id"/>
-        <result property="factoryId" column="factory_id"/>
+        <result property="factoryCoverId" column="factory_cover_id"/>
+        <result property="factoryBeerId" column="factory_beer_id"/>
+        <result property="standbyRatio" column="standby_ratio"/>
+        <result property="reasonApply" column="reason_apply"/>
         <result property="boxCodeFormatId" column="box_code_format_id"/>
         <result property="sapOrderNo" column="sap_order_no"/>
-        <result property="batchNumber" column="batch_number"/>
-        <result property="name" column="name"/>
         <result property="qrNumber" column="qr_number"/>
         <result property="applyStatus" column="apply_status"/>
         <result property="generateStatus" column="generate_status"/>
@@ -21,8 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
-        <!-- 部门 -->
-        <result property="factoryName" column="factory_name"/>
+        <!-- 包材厂 -->
+        <result property="factoryCoverName" column="factory_cover_name"/>
+        <!-- 啤酒厂 -->
+        <result property="factoryBeerName" column="factory_beer_name"/>
         <!-- 码库 -->
         <result property="qrRepertoryId" column="qr_Repertory_id"/>
         <result property="qrRepertoryName" column="qr_repertory_name"/>
@@ -38,10 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             qp.id,
             qp.material_id,
-            qp.factory_id,
+            qp.factory_cover_id,
             qp.box_code_format_id,
             qp.sap_order_no,
-            qp.name,
             qp.qr_number,
             qp.apply_status,
             qp.is_download,
@@ -55,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qr_package qp
         LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
         LEFT JOIN base_material bm ON qp.material_id = bm.id
-        LEFT JOIN base_factory bf ON qp.factory_id = bf.id
+        LEFT JOIN base_factory bf ON qp.factory_cover_id = bf.id
         LEFT JOIN user_info ui ON qp.create_by = ui.id
         <where>
             qp.is_delete = 0
@@ -68,8 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="param.sapOrderNo != null and param.sapOrderNo != ''">
                 AND qp.sap_order_no like concat('%',#{param.sapOrderNo},'%')
             </if>
-            <if test="param.factoryId != null">
-                AND qp.factory_id = #{param.factoryId}
+            <if test="param.factoryCoverId != null">
+                AND qp.factory_cover_id = #{param.factoryCoverId}
             </if>
             <if test="param.applyStatus != null">
                 AND qp.apply_status = #{param.applyStatus}
@@ -81,11 +83,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             qp.id,
             qp.material_id,
-            qp.factory_id,
+            qp.factory_cover_id,
+            qp.factory_beer_id,
+            qp.standby_ratio,
+            qp.reason_apply,
             qp.box_code_format_id,
             qp.sap_order_no,
-            qp.batch_number,
-            qp.name,
             qp.qr_number,
             qp.apply_status,
             qp.generate_status,
@@ -96,7 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qp.update_time,
             qp.update_by,
             bm.material_name,
-            bf.factory_name,
+            bfc.factory_name as factory_cover_name,
+            bfb.factory_name as factory_beer_name,
             qr.id AS qr_Repertory_id,
             qr.name AS qr_repertory_name,
             qr.type AS qr_repertory_type,
@@ -107,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN qr_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_material bm ON qp.material_id = bm.id
-        LEFT JOIN base_factory bf ON qp.factory_id = bf.id
+        LEFT JOIN base_factory bfc ON qp.factory_cover_id = bfc.id
+        LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.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}