From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs | 129 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 108 insertions(+), 21 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs
index 00005cf..79e1071 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs
@@ -5,51 +5,138 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.DB.Models;
+using WIDESEA_Core.Enums;
namespace WIDESEA_Model.Models
{
+ /// <summary>
+ /// 鐗╂枡淇℃伅
+ /// </summary>
[SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
- public class Dt_MaterielInfo : BaseEntity
+ [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
+ public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity
{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鍖哄煙涓婚敭")]
- public int AreaId { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
+ public int WarehouseId { get; set; }
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡id")]
+ public int MaterielId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
public string MaterielCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
[SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
public string MaterielName { get; set; }
- [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐗╂枡鎻忚堪")]
- public string MaterielDes { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "瀹瑰櫒绫诲瀷", DefaultValue = "0")]
- public int CotainerType { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
+ public string? MaterielType { get; set; }
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍖呰瑙勬牸")]
- public string Packspes { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴�у垎绫�(1:閲囪喘浠躲��2:鑷埗浠躲��3:閲囪喘&鑷埗浠�)")]
+ public string? MaterielSourceType { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴��", DefaultValue = "0")]
- public int Attribute { get; set; }
+ /// <summary>
+ /// 鍩烘湰鍗曚綅(buyUnitId/StockUnitId)
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅(buyUnitId/StockUnitId)")]
+ public string? MaterielUnit { get; set; }
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁￠噺鍗曚綅", DefaultValue = "0")]
- public string Unit { get; set; }
+ /// <summary>
+ /// 鐗堟湰鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗堟湰鍚嶇О")]
+ public string? MaterielVersion { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏈夋晥鏈�", DefaultValue = "-1")]
- public int Validity { get; set; }
+ /// <summary>
+ /// 鐗╂枡灏哄
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡灏哄")]
+ public float? MaterielSize { get; set; }
- [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "瀹夊叏搴撳瓨", DefaultValue = "-1")]
- public decimal SafetyStock { get; set; }
+ /// <summary>
+ /// 鐗╂枡闀垮害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
+ public float? MaterielLength { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋壒")]
- public bool IsMixBatch { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍘氬害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍘氬害")]
+ public float? MaterielThickness { get; set; }
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋枡")]
- public bool IsMixMateriel { get; set; }
+ /// <summary>
+ /// 鐗╂枡瀹藉害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡瀹藉害")]
+ public float? MaterielWide { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍨嬪彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
+ public string MaterielModel { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)")]
+ public EnableEnum MaterielState { get; set; }
+
+ /// <summary>
+ /// 淇濊川鏈�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "淇濊川鏈�")]
+ public float? MaterielQa{ get; set; }
+
+
+ /// <summary>
+ /// 渚涘簲鍟咺D
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
+ public string SupplierId { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗕唬鐮�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
+ public string SupplierCode { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
+ public string SupplierName { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
}
--
Gitblit v1.9.3