From e711c834aec2293c53b07efe53e81e3573c289b6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 01 四月 2026 11:42:44 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index f9e7fa6..3bc67ce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -5,6 +5,7 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.manager.service.BatchRegularService;
 import com.vincent.rsf.server.manager.service.CompanysService;
@@ -29,7 +30,7 @@
 import java.util.Date;
 
 @Data
-@TableName("man_matnr")
+@TableName(value = "man_matnr", autoResultMap = true)
 @Accessors(chain = true)
 @ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
 public class Matnr implements Serializable {
@@ -224,6 +225,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
@@ -270,6 +272,24 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    private String baseUnit;
+    private String useOrgId;
+    private String useOrgName;
+    private String erpClsId;
+
+    /**
+     * 浠撳簱闄愬埗鍚嶇О
+     */
+    @ApiModelProperty(value= "浠撳簱闄愬埗缂栫爜")
+    private String warehouseRestrictionCode;
+
+    /**
+     * 瀹瑰櫒绫诲瀷
+     */
+    @ApiModelProperty(value= "瀹瑰櫒绫诲瀷闆嗗悎")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Integer> containerTypes;
+
     /**
      * 澶囨敞
      */

--
Gitblit v1.9.1