Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

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

@@ -47,6 +47,9 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("啤酒厂名称")
     private String factoryBeerName;
 
+    @ApiModelProperty("文件校验MD5")
+    private String fileVerifyMd5;
+
     @ApiModelProperty(value = "备用码包")
     private Integer standbyRatio;
 

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

@@ -24,7 +24,7 @@ public class QueryOrderFormLimitReq extends PageReq implements Serializable {
     private String materialName;
 
     @ApiModelProperty(value = "包材厂")
-    private String factoryCoverName;
+    private String factoryCoverId;
 
     @ApiModelProperty(value = "是否关联SAP单号 1是  2否")
     private String associateSapOrder;

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

@@ -48,6 +48,9 @@ public class GetQrPackageDetailRes implements Serializable {
 	@ApiModelProperty("啤酒厂名称")
 	private String factoryBeerName;
 
+	@ApiModelProperty("文件校验MD5")
+	private String fileVerifyMd5;
+
 	@ApiModelProperty(value = "备用码包")
 	private Integer standbyRatio;
 

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

@@ -68,8 +68,8 @@
             <if test="null != queryOrderFormLimitReq.materialName and queryOrderFormLimitReq.materialName != ''">
                 AND material.material_name LIKE CONCAT('%',#{queryOrderFormLimitReq.materialName},'%')
             </if>
-            <if test="null != queryOrderFormLimitReq.factoryCoverName and  queryOrderFormLimitReq.factoryCoverName != ''">
-                AND factory.id = #{queryOrderFormLimitReq.factoryCoverName}
+            <if test="null != queryOrderFormLimitReq.factoryCoverId and  queryOrderFormLimitReq.factoryCoverId != ''">
+                AND factory.id = #{queryOrderFormLimitReq.factoryCoverId}
             </if>
             <if test=" 1 == queryOrderFormLimitReq.associateSapOrder">
                 AND bookingOrder.sap_order_no IS NOT NULL

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

@@ -117,6 +117,7 @@
             qp.update_time,
             qp.update_by,
             qp.qr_type,
+            qp.file_verify_md5,
             bcf.name as box_code_format_name,
             f_cover.factory_name as factory_cover_name,
             f_cover.is_first_factory,