Merge branch 'master' of http://115.190.214.62:3001/Teams/kunshan-bzfm-mes-backend

DOAN.Model/MES/Material/Dto/MmInventoryDto.cs

@@ -11,6 +11,9 @@ namespace DOAN.Model.BZFM.Dto
 
         public string WarehouseName { get; set; }
         public string LocationCode { get; set; }
+        public string SupplierCode { get; set; }
+
+        public string SupplierName { get; set; }
         public string BatchNo { get; set; }
     }
 
@@ -27,9 +30,9 @@ namespace DOAN.Model.BZFM.Dto
 
         public string MaterialName { get; set; }
 
-        [Required(ErrorMessage = "仓库编码不能为空")]
         public string WarehouseCode { get; set; }
 
+
         public string WarehouseName { get; set; }
 
         [Required(ErrorMessage = "库位编码不能为空")]
@@ -37,6 +40,10 @@ namespace DOAN.Model.BZFM.Dto
 
         public string LocationName { get; set; }
 
+        public string SupplierCode { get; set; }
+
+        public string SupplierName { get; set; }
+
         public string BatchNo { get; set; }
 
         public decimal CurrentQty { get; set; }

DOAN.Model/MES/Material/Dto/MmMaterialDto.cs

@@ -74,6 +74,9 @@ namespace DOAN.Model.BZFM.Dto
         public string MaterialName { get; set; }
         public string Specification { get; set; }
         public string CategoryCode { get; set; }
+        public string SupplierCode { get; set; }
+        public string SupplierName { get; set; }
+        public string Type { get; set; }
     }
 
     // <summary>

DOAN.Model/MES/Material/MmInventory.cs

@@ -49,6 +49,18 @@ namespace DOAN.Model.BZFM
         [SugarColumn(ColumnName = "location_name")]
         public string LocationName { get; set; }
 
+        /// <summary>
+        /// 供应商编码 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_code")]
+        public string SupplierCode { get; set; }
+
+        /// <summary>
+        /// 供应商名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_name")]
+        public string SupplierName { get; set; }
+
         /// <summary>
         /// 批次号 
         /// </summary>