箱码合一枚举

修改物料枚举
码包添加字段码包生成时间

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

@@ -60,6 +60,9 @@ public class QrPackage implements Serializable {
 	@Schema(name = "生成状态 0-未生成 1-生成中 2-已生成 3-失败")
 	private Integer generateStatus;
 
+	@Schema(name = "码包生成时间")
+	private LocalDateTime generateTime;
+
 	@Schema(name = "下载路径")
 	private String downloadPath;
 

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

@@ -0,0 +1,49 @@
+package com.abi.qms.platform.dao.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * 箱码合一激活状态
+ * @Author AndyTan
+ */
+@Getter
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum BoxMappingActiveStatusEnum {
+
+	//箱码合一激活状态: 0-未激活 1-已激活 9-已作废
+	NOT_ACTIVE(0,"未激活"),
+	ACTIVATED(1,"已激活"),
+	INVALID(9,"已作废");
+
+	@EnumValue
+	private Integer code;
+	private String name;
+
+	private static final Set<BoxMappingActiveStatusEnum> ALL = EnumSet.allOf(BoxMappingActiveStatusEnum.class);
+
+    public static String getName(Integer code) {
+        return ALL.stream()
+                .filter(o -> o.code.equals(code))
+                .map(o -> o.getName())
+                .findAny().orElse(null);
+    }
+
+    public static Integer getCode(String name) {
+        return ALL.stream()
+                .filter(o -> o.name.equals(name))
+                .map(o -> o.getCode())
+                .findAny().orElse(null);
+    }
+
+	public boolean is(Integer code){
+		return getCode().equals(code);
+	}
+
+}

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

@@ -28,7 +28,7 @@ public enum MaterialTypeEnum {
 //	BUCKET_FORK(7,"小桶&叉子"),
 //	TRAY(8,"托盘");
 
-	//物料类型: 4-瓶盖 5-纸板箱
+	//物料类型: 3-罐子 4-瓶盖 5-纸板箱
 	BOTTLE_CAP(4,"瓶盖"),
 	CARTON(5,"纸板箱");
 

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

@@ -4,6 +4,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.abi.qms.platform.dao.mapper.QrPackageMapper">
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.QrPackage">
+        <id column="ID" property="id" />
+        <result column="MATERIAL_ID" property="materialId" />
+        <result column="FACTORY_COVER_ID" property="factoryCoverId" />
+        <result column="FACTORY_BEER_ID" property="factoryBeerId" />
+        <result column="STANDBY_RATIO" property="standbyRatio" />
+        <result column="BOX_CODE_FORMAT_ID" property="boxCodeFormatId" />
+        <result column="SAP_ORDER_NO" property="sapOrderNo" />
+        <result column="QR_NUMBER" property="qrNumber" />
+        <result column="APPLY_STATUS" property="applyStatus" />
+        <result column="GENERATE_STATUS" property="generateStatus" />
+        <result column="GENERATE_TIME" property="generateTime" />
+        <result column="REASON_APPLY" property="reasonApply" />
+        <result column="DOWNLOAD_PATH" property="downloadPath" />
+        <result column="IS_DOWNLOAD" property="isDownload" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="CREATE_BY" property="createBy" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="UPDATE_BY" property="updateBy" />
+        <result column="IS_DELETE" property="isDelete" />
+        <result column="ZIP_PASSWORD" property="zipPassword" />
+        <result column="QR_TYPE" property="qrType" />
+        <result column="FACTORY_COVER_LEVEL_TWO_ID" property="factoryCoverLevelTwoId" />
+    </resultMap>
+
     <resultMap type="com.abi.qms.platform.dao.vo.result.QrPackageVO" id="QrPackageResult">
         <result property="id" column="id"/>
         <result property="materialId" column="material_id"/>
@@ -37,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="createTime" column="download_time"/>
             <result property="createByName" column="download_user_name"/>
         </collection>
-
         <!-- 码包批次列表 -->
         <collection property="qrPackageBatchVOList" javaType="java.util.List" ofType="com.abi.qms.platform.dao.vo.result.QrPackageBatchVO">
             <result property="id" column="batch_id"/>