Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/enums/BrandEnums.java

@@ -0,0 +1,45 @@
+package org.springblade.common.enums;
+
+import cn.hutool.core.util.EnumUtil;
+import lombok.Getter;
+
+import java.io.Serializable;
+
+/**
+ * 定义工厂枚举
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-20 16:08
+ */
+@Getter
+public enum BrandEnums implements Serializable {
+
+	ZB(1, "志邦"),
+	SNM(2, "诗尼曼"),
+	PAN(3, "皮阿诺"),
+	MTMM(4, "梦天"),
+	OP(5, "欧派"),
+	SFY(6, "索菲亚"),
+	JP(7, "金牌"),
+	OLO(8, "我乐"),
+	MHJ(9, "曼好家"),
+	LINSY(10, "林氏家居"),
+	;
+
+	private final Integer code;
+	private final String value;
+
+	BrandEnums(Integer code, String value) {
+		this.code = code;
+		this.value = value;
+	}
+
+	public static BrandEnums getByCode(Integer code) {
+		return EnumUtil.getBy(BrandEnums::getCode, code);
+	}
+
+	public static BrandEnums getByValue(String val) {
+		return EnumUtil.getBy(BrandEnums::getValue, val);
+	}
+
+}

blade-biz-common/src/main/java/org/springblade/common/enums/PackageTypeEnums.java

@@ -0,0 +1,31 @@
+package org.springblade.common.enums;
+
+import org.springblade.common.model.IDict;
+
+/**
+ * 包件类型枚举
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-20 16:08
+ */
+public enum PackageTypeEnums implements IDict<Integer> {
+
+	/**
+	 * 订制品
+	 */
+	CMP(1, "订制品"),
+	/**
+	 * 零担
+	 */
+	LTL(2, "零担"),
+	/**
+	 * 库存品
+	 */
+	INV(3, "库存品"),
+	;
+
+	PackageTypeEnums(Integer code, String value) {
+		init(code, value);
+	}
+
+}

blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java

@@ -0,0 +1,59 @@
+package org.springblade.common.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springblade.common.constant.WorkNodeEnums;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 节点广播消息
+ * 用于节点操作触发消息发送广播通知
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-18 0:45
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NodeFanoutMsg implements Serializable {
+
+	/**
+	 * 作业节点
+	 */
+	private WorkNodeEnums node;
+
+	/**
+	 * 操作人
+	 */
+	private String operator;
+
+	/**
+	 * 操作时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date operatorTime;
+
+	/**
+	 * 当前仓
+	 */
+	private String warehouse;
+
+	/**
+	 * 主单数据
+	 * {"boId":"业务id","":""}
+	 */
+	private Object main;
+
+	/**
+	 * 内容
+	 */
+	private List<PackageData> details;
+
+}

blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java

@@ -0,0 +1,49 @@
+package org.springblade.common.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springblade.common.enums.BrandEnums;
+import org.springblade.common.enums.PackageTypeEnums;
+
+import java.io.Serializable;
+
+/**
+ * 提送数据
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-18 0:45
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PackageData implements Serializable {
+
+	/**
+	 * 包件码
+	 */
+	private String packageCode;
+	/**
+	 * 订单号
+	 */
+	private String orderCode;
+	/**
+	 * 运单号
+	 */
+	private String waybillNumber;
+	/**
+	 * 数量
+	 */
+	private String number;
+	/**
+	 * 包件类型 订制品，库存品，零担
+	 */
+	private PackageTypeEnums packageType;
+	/**
+	 * 品牌
+	 */
+	private BrandEnums brand;
+
+}