整理码包列表分页查询的入参和出参

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

@@ -39,6 +39,15 @@ public class ListQrPackageRes extends PageResp implements Serializable {
 		@ApiModelProperty("码包id")
 		private Long id;
 
+		@ApiModelProperty(value = "物料id")
+		private Long materialId;
+
+		@ApiModelProperty("物料名称")
+		private String materialName;
+
+		@ApiModelProperty("SAP单号")
+		private String sapOrderNo;
+
 		@ApiModelProperty(value = "包材厂id")
 		private Long factoryId;
 
@@ -51,29 +60,20 @@ public class ListQrPackageRes extends PageResp implements Serializable {
 		@ApiModelProperty("箱码幅面名称")
 		private String boxCodeFormatName;
 
-		@ApiModelProperty("码库名称")
-		private String qrRepertoryName;
-
-		@ApiModelProperty("码库类型")
-		private Integer qrRepertoryType;
-
-		@ApiModelProperty("批次号")
-		private String batchNumber;
-
 		@ApiModelProperty("码包名称")
 		private String name;
 
 		@ApiModelProperty("码数量")
 		private Long qrNumber;
 
+		@ApiModelProperty("已使用码数量")
+		private Long qrNumberUse = 0L;
+
 		@ApiModelProperty("申请状态 0-待审核 1-审核通过 2-审核拒绝")
 		private Integer applyStatus;
 
-		@ApiModelProperty("生成状态 0-未生成 1-生成中 2-已生成 3-失败")
-		private Integer generateStatus;
-
-		@ApiModelProperty("下载路径")
-		private String downloadPath;
+		@ApiModelProperty("是否已下载")
+		private Integer isDownload;
 
 		@ApiModelProperty(value = "创建时间")
 		@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -84,13 +84,5 @@ public class ListQrPackageRes extends PageResp implements Serializable {
 
 		@ApiModelProperty(value = "创建人名称")
 		private String createByName;
-
-		@ApiModelProperty(value = "修改时间")
-		@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private LocalDateTime updateTime;
-
-		@ApiModelProperty(value = "修改人id")
-		private Long updateBy;
-
 	}
 }

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

@@ -41,28 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qp.factory_id,
             qp.box_code_format_id,
             qp.sap_order_no,
-            qp.batch_number,
             qp.name,
             qp.qr_number,
             qp.apply_status,
-            qp.generate_status,
-            qp.download_path,
             qp.is_download,
             qp.create_time,
             qp.create_by,
-            qp.update_time,
-            qp.update_by,
             bm.material_name,
             bf.factory_name,
             bcf.name AS box_code_format_name,
-            qr.id AS qr_repertory_id,
-            qr.name AS qr_repertory_name,
-            qr.type AS qr_repertory_type,
             ui.user_name AS create_by_name
         FROM
             qr_package qp
         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 user_info ui ON qp.create_by = ui.id