From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java
index d8a3f12..ef8192b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java
@@ -24,53 +24,47 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",width = 10,index = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鍑哄叆搴撹褰曚富閿�", example = "1")
- @ExcelColumn(name="鍑哄叆搴撹褰曚富閿�")
private Integer outInBoundId;
@ApiModelProperty(value = "鐗╄祫缂栫爜锛堝叧鑱攜w_material)", example = "1")
- @ExcelColumn(name="鐗╄祫缂栫爜锛堝叧鑱攜w_material)")
private Integer materialId;
@ApiModelProperty(value = "鏁伴噺", example = "1")
- @ExcelColumn(name="鏁伴噺")
+ @ExcelColumn(name="鏁伴噺",width = 10,index = 5)
private BigDecimal stock;
@ApiModelProperty(value = "璧勪骇缂栫爜")
@TableField(exist = false)
+ @ExcelColumn(name="鐗╂枡缂栫爜",width = 10,index = 1)
private String materialCode;
@ApiModelProperty(value = "璧勪骇鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="鐗╂枡鍚嶇О",width = 10,index = 2)
private String materialName;
@ApiModelProperty(value = "璧勪骇鏉″舰鐮�")
@@ -83,6 +77,7 @@
@ApiModelProperty(value = "璧勪骇鍗曚綅")
@TableField(exist = false)
+ @ExcelColumn(name="鍗曚綅",width = 10,index = 6)
private String materialUnitName;
@ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�1=鍑哄簱锛�0=鍏ュ簱锛堝垎椤靛垪琛ㄦ煡璇娇鐢級", example = "1")
@@ -95,31 +90,38 @@
@ApiModelProperty(value = "浠撳簱鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="浠撳簱",width = 10,index = 8)
private String warehouseName;
@ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍗曟嵁鏃ユ湡",width = 10,index = 0,dateFormat = "yyyy-MM-dd")
private Date doneDate;
@ApiModelProperty(value = "涓�绾у垎绫诲悕绉�")
@TableField(exist = false)
+ @ExcelColumn(name="鐗╂枡鍒嗙被",width = 10,index = 3)
private String categoryParentName;
@ApiModelProperty(value = "浜岀骇鍒嗙被鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="鐗╂枡瀛愬垎绫�",width = 10,index = 4)
private String categoryName;
@ApiModelProperty(value = "鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
+ @ExcelColumn(name="鍒涘缓浜�",width = 10,index = 10)
private String createUserName;
@ApiModelProperty(value = "鍗曟嵁缂栧彿", example = "1")
@TableField(exist = false)
+ @ExcelColumn(name="鍗曟嵁缂栧彿",width = 10,index = 9)
private String code;
@ApiModelProperty(value = "绫诲瀷 0閲囪喘鍏ュ簱 1棰嗙敤閫�鍥� 2璋冩暣鍏ュ簱 3鍏朵粬鍏ュ簱 4鐩樼泩鍏ュ簱 5棰嗙敤鍑哄簱 6浠撳簱鍑哄簱 7璋冩暣鍑哄簱 8閲囪喘鍑哄簱 9鍏朵粬鍑哄簱 10鐩樹簭鍑哄簱", example = "1")
@TableField(exist = false)
+ @ExcelColumn(name="绫诲瀷",width = 10,index = 7,valueMapping = "0=閲囪喘鍏ュ簱;1=棰嗙敤閫�鍥�;2=璋冩暣鍏ュ簱;3=鍏朵粬鍏ュ簱;4=鐩樼泩鍏ュ簱;5=棰嗙敤鍑哄簱;6=浠撳簱鍑哄簱;7=璋冩暣鍑哄簱;8=閲囪喘鍑哄簱;9=鍏朵粬鍑哄簱;10=鐩樹簭鍑哄簱;")
private Integer type;
--
Gitblit v1.9.3