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/dto/OutboundOrderAndDetailDto.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java
new file mode 100644
index 0000000..b4c1d9e
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java
@@ -0,0 +1,101 @@
+package org.jeecg.modules.tms.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="鍑哄簱鐢宠鍗曞強鏄庣粏瀵硅薄灏佽", description="鍑哄簱鐢宠鍗曞強鏄庣粏瀵硅薄灏佽")
+public class OutboundOrderAndDetailDto implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭id*/
+ @ApiModelProperty(value = "涓婚敭id")
+ private String id;
+ /**鍑哄簱鍗曠紪鍙�*/
+ @ApiModelProperty(value = "鍑哄簱鍗曠紪鍙�")
+ private String outNum;
+ /**鍑哄簱绫诲瀷*/
+ @Dict(dicCode = "out_storehouse_type")
+ @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+ private String outStorehouseType;
+ /**鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�*/
+ @ApiModelProperty(value = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�")
+ private Integer isReturn;
+ /**缁忔墜浜�*/
+ @ApiModelProperty(value = "缁忔墜浜�")
+ private String handler;
+ /**瀹℃牳浜�*/
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String reviewer;
+ /**鍗曞瓙鐘舵��*/
+ @ApiModelProperty(value = "鍗曞瓙鐘舵��")
+ private String orderStatus;
+ /**瀹℃牳鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ private Date auditDate;
+ /**瀹℃牳鎰忚*/
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalOpinion;
+ /**棰嗙敤浜嬬敱*/
+ @ApiModelProperty(value = "棰嗙敤浜嬬敱")
+ private String subjectMatter;
+ /**鍑哄簱鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍑哄簱鏃堕棿")
+ private Date outboundTime;
+ /**闆朵欢鍥惧彿*/
+ @ApiModelProperty(value = "闆朵欢鍥惧彿")
+ private String partDrawingNo;
+ /**闆朵欢鍚嶇О*/
+ @ApiModelProperty(value = "闆朵欢鍚嶇О")
+ private String partName;
+ /**闆朵欢鏉愭枡*/
+ @ApiModelProperty(value = "闆朵欢鏉愭枡")
+ private String partMaterial;
+ /**鍔犲伐鎵规*/
+ @ApiModelProperty(value = "宸ュ簭锛堝伐姝ュ彿锛�")
+ private String productionProcessesNo;
+ /**鍔犲伐鎵规*/
+ @ApiModelProperty(value = "鍔犲伐鎵规")
+ private String batchCode;
+ /**鍔犲伐鏁伴噺*/
+ @ApiModelProperty(value = "鍔犲伐鏁伴噺")
+ private String machiningCount;
+ /**鍔犲伐璁惧*/
+ @ApiModelProperty(value = "鍔犲伐璁惧")
+ private String equipmentCode;
+ /**绋嬪簭鍚�*/
+ @ApiModelProperty(value = "绋嬪簭鍚�")
+ private String ncName;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍑哄簱鐢宠鍗曟槑缁�*/
+ @ApiModelProperty(value = "鍑哄簱鐢宠鍗曟槑缁�")
+ private List<OutboundDetail> outboundDetailList;
+}
--
Gitblit v1.9.3