From 2728af674688a3d4d18ef498fde3ea808549f51b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 13:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
index 17ea617..aabe18f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
@@ -27,8 +27,8 @@
/// <summary>
/// 浠撳簱缂栧彿锛涘簱鎴跨紪鍙�
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "浠撳簱缂栧彿")]
+ public string WarehouseCode { get; set; }
/// <summary>
/// 鐗╂枡缂栧彿
@@ -37,13 +37,19 @@
public string MaterielCode { get; set; }
/// <summary>
+ /// 涓婃父缁欑殑鍩虹鐗╂枡绫诲瀷
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父缁欑殑鍩虹鐗╂枡绫诲瀷")]
+ public string MaterielErpType { get; set; }
+
+ /// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
[SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
public string MaterielName { get; set; }
/// <summary>
- /// 鍝佸悕
+ /// 鍝佸悕/閫氱敤鍚�
/// </summary>
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍝佸悕")]
public string item { get; set; }
@@ -57,7 +63,7 @@
/// <summary>
/// 鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)锛涘叏閮ㄩ粯璁ゆ垚鍝�
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:澶т欢銆�2:灏忎欢銆�3:鍘熸潗鏂欍��4:澶囦欢)")]
public MaterielTypeEnum MaterielType { get; set; } = MaterielTypeEnum.FinishProduct;
/// <summary>
@@ -116,7 +122,7 @@
/// 鐗╂枡瀛樺偍鏉′欢
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡瀛樺偍鏉′欢")]
- public float? MaterielStoragecondition { get; set; }
+ public float ? MaterielStoragecondition { get; set; }
/// <summary>
/// 绠辫
--
Gitblit v1.9.3