From a2ac226eba37410a5f668c866fd45ce43c756394 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 十月 2025 14:28:29 +0800
Subject: [PATCH] 前端和后端的更新
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_MedicineGoods.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 8 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_MedicineGoods.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_MedicineGoods.cs"
index 2e47eec..ab4ecb4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_MedicineGoods.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_MedicineGoods.cs"
@@ -4,6 +4,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
@@ -14,56 +17,148 @@
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栧彿锛涘簱鎴跨紪鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠撳簱缂栧彿")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "Goods_no", IsNullable = true, Length = 50, ColumnDescription = "鑽搧缂栫爜锛堝敮涓�锛�")]
public string Goods_no { get; set; }
+
+ /// <summary>
+ /// 璐х墿绫诲瀷/鑽搧/鍣ㄦ潗
+ /// </summary>
[SugarColumn(ColumnName = "MaterialCode", IsNullable = true, Length = 50, ColumnDescription = "璐х墿绫诲瀷/鑽搧/鍣ㄦ潗")]
public string MaterialCode { get; set; }
+ /// <summary>
+ /// 鑽搧閫氱敤鍚�
+ /// </summary>
[SugarColumn(ColumnName = "Goods_tym", IsNullable = true, Length = 50, ColumnDescription = "鑽搧閫氱敤鍚�")]
public string Goods_tym { get; set; }
+ /// <summary>
+ /// 鑽搧鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "Goods_spm", IsNullable = true, Length = 50, ColumnDescription = "鑽搧鍚嶇О")]
public string Goods_spm { get; set; }
- [SugarColumn(ColumnName = "Model", IsNullable = true, Length = 70, ColumnDescription = "瑙勬牸")]
- public string Model { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "Model", IsNullable = true, Length = 70, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string Model { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)锛涘叏閮ㄩ粯璁ゆ垚鍝�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
+ public MaterielTypeEnum MaterielType { get; set; } = MaterielTypeEnum.FinishProduct;
+
+ /// <summary>
+ /// 鐗╂枡灞炴�у垎绫�(1:澶т欢銆�2:灏忎欢)
+ /// 澶т欢鍙斁骞冲簱锛屽皬浠舵牴鎹珛搴撴渶浣庡簱瀛樻暟鍜岀瑙�(鏁ｈ揣)鍖哄垎鏄惁鍏ョ珛搴�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴�у垎绫�(1:澶т欢銆�2:灏忎欢)")]
+ public MaterielSourceTypeEnum MaterielSourceType { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍘傚
+ /// </summary>
[SugarColumn(ColumnName = "Factory", IsNullable = true, Length = 50, ColumnDescription = "鐢熶骇鍘傚")]
public string Factory { get; set; }
+
+ /// <summary>
+ /// 璁￠噺鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "Unit", IsNullable = true, Length = 20, ColumnDescription = "璁￠噺鍗曚綅")]
public string Unit { get; set; }
-
+ /// <summary>
+ /// 鍗曞搧闀垮害锛屾绫充负鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "Item_Iength", IsNullable = true, ColumnDescription = "鍗曞搧闀垮害锛屾绫充负鍗曚綅")]
public decimal? Item_Iength { get; set; }
+ /// <summary>
+ /// 鍗曞搧瀹藉害锛屾绫充负鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "Item_width", IsNullable = true, ColumnDescription = "鍗曞搧瀹藉害锛屾绫充负鍗曚綅")]
public decimal ?Item_width { get; set; }
+
+ /// <summary>
+ /// 鍗曞搧楂樺害锛屾绫充负鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "Item_hight", IsNullable = true, ColumnDescription = "鍗曞搧楂樺害锛屾绫充负鍗曚綅")]
public decimal? Item_hight { get; set; }
+
+ /// <summary>
+ /// 鍗曞搧浣撶Н锛岀珛鏂规绫充负鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "Item_volumn", IsNullable = true, ColumnDescription = "鍗曞搧浣撶Н锛岀珛鏂规绫充负鍗曚綅")]
public decimal ?Item_volumn { get; set; }
+
+
+ /// <summary>
+ /// 鍗曞搧閲嶉噺锛屽厠涓哄崟浣�
+ /// </summary>
[SugarColumn(ColumnName = "Item_weight", IsNullable = true, ColumnDescription = "鍗曞搧閲嶉噺锛屽厠涓哄崟浣�")]
public decimal ?Item_weight { get; set; }
-
+ /// <summary>
+ /// 鍌ㄥ瓨鏉′欢
+ /// </summary>
[SugarColumn(ColumnName = "Storage_cond", IsNullable = true, Length = 100, ColumnDescription = "鍌ㄥ瓨鏉′欢")]
public string Storage_cond { get; set; }
+
+ /// <summary>
+ /// 绠辫
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绠辫")]
+ public decimal BoxQty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱鏈�浣庡簱瀛樻暟
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绔嬪簱鏈�浣庡簱瀛樻暟")]
+ public decimal MinQty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱涓氬姟搴撳瓨鏁�;鏍规嵁鍑哄叆搴撴暟閲忓彉鍖�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绔嬪簱涓氬姟搴撳瓨鏁�")]
+ public decimal Business_qty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱鏈�楂樺簱瀛樻暟
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "绔嬪簱鏈�楂樺簱瀛樻暟")]
+ public float? MaxQty { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)")]
+ public EnableEnum MaterielState { get; set; }
+
+ [SugarColumn(ColumnName = "GoodStatus", IsNullable = true, Length = 50, ColumnDescription = "鑽搧鐘舵�侊紝鏄惁涓嬪彂缁檞cs锛屾湭涓嬪彂锛屼笅鍙戝畬鎴�")]
+ public string GoodStatus { get; set; }
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
-
-
- [SugarColumn(ColumnName = "GoodStatus", IsNullable = true, Length = 50, ColumnDescription = "鑽搧鐘舵�侊紝鏄惁涓嬪彂缁檞cs锛屾湭涓嬪彂锛屼笅鍙戝畬鎴�")]
- public string GoodStatus { get; set; }
}
--
Gitblit v1.9.3