From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktakingRecord.java |   75 +++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktakingRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktakingRecord.java
index 24f9096..44c5b68 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktakingRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStocktakingRecord.java
@@ -1,6 +1,8 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,74 +21,113 @@
 @Data
 @ApiModel("杩愮淮鐩樼偣鏄庣粏璁板綍琛�")
 @TableName("`yw_stocktaking_record`")
-public class YwStocktakingRecord {
+public class YwStocktakingRecord extends LoginUserModel {
 
     @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")
     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="澶囨敞")
+    @ExcelColumn(name="澶囨敞",index = 9,width = 30)
     private String remark;
 
     @ApiModelProperty(value = "鐘舵�� 0鏈紑濮� 1宸茬洏鐐�", example = "1")
-    @ExcelColumn(name="鐘舵�� 0鏈紑濮� 1宸茬洏鐐�")
     private Integer status;
 
     @ApiModelProperty(value = "鐩樼偣鍛樼紪鐮�(鍏宠仈system_user)")
-    @ExcelColumn(name="鐩樼偣鍛樼紪鐮�(鍏宠仈system_user)")
     private String userId;
 
     @ApiModelProperty(value = "鐩樼偣鏃堕棿")
-    @ExcelColumn(name="鐩樼偣鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planDate;
 
     @ApiModelProperty(value = "缂栧彿")
-    @ExcelColumn(name="缂栧彿")
     private String code;
 
     @ApiModelProperty(value = "鐗╄祫缂栫爜锛堝叧鑱攜w_material)", example = "1")
-    @ExcelColumn(name="鐗╄祫缂栫爜锛堝叧鑱攜w_material)")
     private Integer materialId;
 
     @ApiModelProperty(value = "璐﹂潰鏁伴噺", example = "1")
-    @ExcelColumn(name="璐﹂潰鏁伴噺")
+    @ExcelColumn(name="璐﹂潰鏁伴噺",index = 7,width = 10)
     private BigDecimal stock;
 
     @ApiModelProperty(value = "瀹為檯鐩樼偣搴撳瓨閲�", example = "1")
-    @ExcelColumn(name="瀹為檯鐩樼偣搴撳瓨閲�")
+    @ExcelColumn(name="鐩樼偣鏁伴噺",index = 8,width = 10)
     private BigDecimal actStock;
 
     @ApiModelProperty(value = "鐩樼偣 0璐﹀疄鐩哥 1鐩樹簭 2鐩樼泩", example = "1")
-    @ExcelColumn(name="鐩樼偣 0璐﹀疄鐩哥 1鐩樹簭 2鐩樼泩")
     private Integer type;
 
     @ApiModelProperty(value = "鐩樼偣璁″垝缂栫爜(鍏宠仈yw_stocktaking)", example = "1")
-    @ExcelColumn(name="鐩樼偣璁″垝缂栫爜(鍏宠仈yw_stocktaking)")
     private Integer stocktakingId;
 
+    @ApiModelProperty(value = "璧勪骇缂栫爜")
+    @TableField(exist = false)
+    @ExcelColumn(name="鐗╂枡缂栫爜",index = 0,width = 10)
+    private String materialCode;
+
+    @ApiModelProperty(value = "璧勪骇鍚嶇О")
+    @TableField(exist = false)
+    @ExcelColumn(name="鐗╂枡鍚嶇О",index = 1,width = 10)
+    private String materialName;
+
+    @ApiModelProperty(value = "璧勪骇鏉″舰鐮�")
+    @TableField(exist = false)
+    @ExcelColumn(name="鏉＄爜",index = 2,width = 10)
+    private String materialQrcode;
+
+    @ApiModelProperty(value = "璧勪骇鍝佺墝")
+    @TableField(exist = false)
+    @ExcelColumn(name="鍝佺墝",index = 3,width = 10)
+    private String materialBrand;
+
+    @ApiModelProperty(value = "璧勪骇瑙勬牸鍨嬪彿")
+    @TableField(exist = false)
+    @ExcelColumn(name="瑙勬牸鍨嬪彿",index = 4,width = 10)
+    private String materialAttr;
+
+    @ApiModelProperty(value = "璧勪骇鍗曚綅")
+    @TableField(exist = false)
+    @ExcelColumn(name="鍗曚綅",index = 5,width = 10)
+    private String materialUnitName;
+
+    @ApiModelProperty(value = "浠撳簱鍚嶇О")
+    @ExcelColumn(name="浠撳簱",index = 6,width = 10)
+    @TableField(exist = false)
+    private String warehouseName;
+
+    @ApiModelProperty(value = "鐩樼偣浜哄悕绉�")
+    @TableField(exist = false)
+    private String userName;
+
+    @ApiModelProperty(value = "鐩樼偣浜虹粍缁囧悕绉�")
+    @TableField(exist = false)
+    private String companyName;
+
+
+
+
+
+
+
+
+
+
 }

--
Gitblit v1.9.3