修改物料bug

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/MaterialProperty.java

@@ -16,7 +16,7 @@ public class MaterialProperty implements AbstractExcelProperty {
     @ExcelHeadAlias(value = "物料号（必填）")
     private String materialCode;
 
-    @ExcelHeadAlias(value = "物料类型（必填）（枚举：罐子、瓶盖、纸板箱）")
+    @ExcelHeadAlias(value = "物料类型（必填）（枚举：罐盖、瓶盖、纸板箱）")
     private String materialType;
 
     @ExcelHeadAlias(value = "二维码（必填）（枚举：是、否）")

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

@@ -32,7 +32,7 @@ public class BaseMaterial {
 	@Schema(name = "物料名称")
     private String materialName;
 
-	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
     @Schema(name = "活动ID")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/enums/MaterialTypeEnum.java

@@ -18,18 +18,18 @@ import java.util.Set;
 public enum MaterialTypeEnum {
 
 	//全量的类型现在用不到，目前就瓶盖和纸板箱
-//	//物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘
+//	//物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘
 //	BOTTLE(1,"瓶子"),
 //	PET(2,"PET"),
-//	JAR(3,"罐子"),
+//	JAR(3,"罐盖"),
 //	BOTTLE_CAP(4,"瓶盖"),
 //	CARTON(5,"纸板箱"),
 //	PLASTIC_BOX(6,"塑箱"),
 //	BUCKET_FORK(7,"小桶&叉子"),
 //	TRAY(8,"托盘");
 
-	//物料类型: 3-罐子 4-瓶盖 5-纸板箱
-	JAR(3,"罐子"),
+	//物料类型: 3-罐盖 4-瓶盖 5-纸板箱
+	JAR(3,"罐盖"),
 	BOTTLE_CAP(4,"瓶盖"),
 	CARTON(5,"纸板箱");
 

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

@@ -17,7 +17,7 @@ public class BaseSapMateriVO {
     @Schema(name = "物料名称")
     private String materialName;
 
-    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
     @Schema(name = "采购数量")

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

@@ -24,7 +24,7 @@ public class MaterialVO {
     @Schema(name = "物料名称")
     private String materialName;
 
-    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
     @Schema(name = "描述")

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

@@ -20,7 +20,7 @@ public class AddMaterialReq implements Serializable {
     private String materialCode;
 
     @NotNull
-    @Schema(name = "物料类型: 3-罐子 4-瓶盖 5-纸板箱")
+    @Schema(name = "物料类型: 3-罐盖 4-瓶盖 5-纸板箱")
     private Integer materialType;
 
     @Schema(name = "是否有二维码 0-没有 1-有")

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

@@ -20,7 +20,7 @@ public class ListMaterialReq extends PageReq implements Serializable {
     @Schema(name = "物料名称")
     private String materialName;
 
-    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
     @Schema(name = "是否有效 0-无效 1-有效")

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

@@ -26,7 +26,7 @@ public class GetMaterialRes implements Serializable {
     @Schema(name = "物料名称")
     private String materialName;
 
-    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
     private Integer materialType;
 
     @Schema(name = "描述")

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

@@ -44,7 +44,7 @@ public class ListMaterialRes extends PageResp implements Serializable {
         @Schema(name = "物料名称")
         private String materialName;
 
-        @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+        @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
         private Integer materialType;
 
         @Schema(name = "描述")

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

@@ -198,7 +198,7 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         if(!queryQrPackageSapOrderItem.getSapCoverFactoryId().equals(factory.getFactoryCode())){
             new BusinessException("关联的SAP订单内包材厂信息与原预订单不符，请确认后重试。");
         }
-        // 8物料类型 3-罐子 4-瓶盖 5-纸板箱
+        // 8物料类型 3-罐盖 4-瓶盖 5-纸板箱
         if(!baseMaterial.getMaterialType().equals(baseMaterialName.getMaterialType())){
             new BusinessException("关联的SAP订单内物料类型与原预订单码类型不符，请确认后重试。");
         }

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

@@ -947,7 +947,7 @@ public class QrPackageServiceImpl implements QrPackageService {
 
     /**
      * 根据物料类型转换码类型
-     * 物料类型： 3-罐子 4-瓶盖 5-纸板箱
+     * 物料类型： 3-罐盖 4-瓶盖 5-纸板箱
      * 码类型：1-箱码 2-盖码
      *
      * @param type

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

@@ -57,6 +57,8 @@
             <if test="roleLevel==5">
                 and r.l5_role_code=#{roleCode}
             </if>
+            <!-- admin不显示 -->
+            and r.role_code != 'admin'
         </where>
 
         order by r.update_time desc