From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java |  160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 160 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java
new file mode 100644
index 0000000..d8c9232
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java
@@ -0,0 +1,160 @@
+package org.jeecg.modules.tms.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import liquibase.pro.packaged.E;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date:   2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tms_outbound_order")
+@ApiModel(value="tms_outbound_order瀵硅薄", description="tms_outbound_order")
+public class OutboundOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**涓婚敭id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭id")
+    private String id;
+	/**鍑哄簱鍗曠紪鍙�*/
+    @Excel(name = "鍑哄簱鍗曠紪鍙�", width = 15)
+    @ApiModelProperty(value = "鍑哄簱鍗曠紪鍙�")
+    private String outNum;
+	/**鍑哄簱绫诲瀷*/
+    @Excel(name = "鍑哄簱绫诲瀷", width = 15, dicCode = "out_storehouse_type")
+    @Dict(dicCode = "out_storehouse_type")
+    @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+    private String outStorehouseType;
+	/**鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�*/
+    @Excel(name = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�", width = 15)
+    @ApiModelProperty(value = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�")
+    private Integer isReturn;
+	/**缁忔墜浜�*/
+    @Excel(name = "缁忔墜浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @ApiModelProperty(value = "缁忔墜浜�")
+    private String handler;
+	/**瀹℃牳浜�*/
+    @Excel(name = "瀹℃牳浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @ApiModelProperty(value = "瀹℃牳浜�")
+    private String reviewer;
+	/**鍗曞瓙鐘舵��*/
+    @Excel(name = "鍗曞瓙鐘舵��", width = 15)
+    @ApiModelProperty(value = "鍗曞瓙鐘舵��")
+    @Dict(dicCode = "out_bill_status")
+    private String orderStatus;
+    /**鍑哄簱鐘舵��*/
+    @Excel(name = "鍑哄簱鐘舵��", width = 15)
+    @ApiModelProperty(value = "鍑哄簱鐘舵��")
+    @Dict(dicCode = "out_storehouse_status")
+    private String outStatus;
+	/**瀹℃牳鏃堕棿*/
+    @Excel(name = "瀹℃牳鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+    private Date auditDate;
+    /**寮�濮嬫椂闂�*/
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    private Date startTime;
+    /**缁撴潫鏃堕棿*/
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    private Date endTime;
+	/**瀹℃牳鎰忚*/
+    @Excel(name = "瀹℃牳鎰忚", width = 15)
+    @ApiModelProperty(value = "瀹℃牳鎰忚")
+    private String approvalOpinion;
+	/**棰嗙敤浜嬬敱*/
+    @Excel(name = "棰嗙敤浜嬬敱", width = 15)
+    @ApiModelProperty(value = "棰嗙敤浜嬬敱")
+    private String subjectMatter;
+	/**鍑哄簱鏃堕棿*/
+    @Excel(name = "鍑哄簱鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "鍑哄簱鏃堕棿")
+    private Date outboundTime;
+	/**澶囨敞*/
+    @Excel(name = "澶囨敞", width = 15)
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+    /**鍑嗗鍗曠紪鍙�*/
+    @Excel(name = "鍑嗗鍗曠紪鍙�", width = 15)
+    @ApiModelProperty(value = "鍑嗗鍗曠紪鍙�")
+    private String preparationOrderId;
+    /**闆朵欢鍥惧彿*/
+    @Excel(name = "闆朵欢鍥惧彿", width = 15)
+    @ApiModelProperty(value = "闆朵欢鍥惧彿")
+    private String partDrawingNo;
+    /**闆朵欢鍚嶇О*/
+    @Excel(name = "闆朵欢鍚嶇О", width = 15)
+    @ApiModelProperty(value = "闆朵欢鍚嶇О")
+    private String partName;
+    /**闆朵欢鏉愭枡*/
+    @Excel(name = "闆朵欢鏉愭枡", width = 15)
+    @ApiModelProperty(value = "闆朵欢鏉愭枡")
+    private String partMaterial;
+    /**鍔犲伐鎵规*/
+    @Excel(name = "宸ュ簭锛堝伐姝ュ彿锛�", width = 15)
+    @ApiModelProperty(value = "宸ュ簭锛堝伐姝ュ彿锛�")
+    private String productionProcessesNo;
+    /**鍔犲伐鎵规*/
+    @Excel(name = "鍔犲伐鎵规", width = 15)
+    @ApiModelProperty(value = "鍔犲伐鎵规")
+    private String batchCode;
+    /**鍔犲伐鏁伴噺*/
+    @Excel(name = "鍔犲伐鏁伴噺", width = 15)
+    @ApiModelProperty(value = "鍔犲伐鏁伴噺")
+    private String machiningCount;
+    /**鍔犲伐璁惧*/
+    @Excel(name = "鍔犲伐璁惧", width = 15)
+    @ApiModelProperty(value = "鍔犲伐璁惧")
+    private String equipmentCode;
+    /**绋嬪簭鍚�*/
+    @Excel(name = "绋嬪簭鍚�", width = 15)
+    @ApiModelProperty(value = "绋嬪簭鍚�")
+    private String ncName;
+	/**绉熸埛鍙�*/
+    @Excel(name = "绉熸埛鍙�", width = 15)
+    @ApiModelProperty(value = "绉熸埛鍙�")
+    private String tenantId;
+	/**鎿嶄綔鍛�*/
+    @ApiModelProperty(value = "鎿嶄綔鍛�")
+    private String createBy;
+	/**鍒涘缓鏃堕棿*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+	/**鏇存柊浜�*/
+    @ApiModelProperty(value = "鏇存柊浜�")
+    private String updateBy;
+	/**鏇存柊鏃堕棿*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    private Date updateTime;
+}

--
Gitblit v1.9.3