From b96e7fb632e229cc8d7f3c271d07e03420323b84 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 17:38:14 +0800
Subject: [PATCH] 物料信息bug修复

---
 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs |  194 ++++++++++++++++++++++++++++--------------------
 1 files changed, 113 insertions(+), 81 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 3ef7770..f1a2169 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -3,8 +3,8 @@
 using System.ComponentModel.DataAnnotations;
 
 namespace Admin.NET.Application
-{    
-    
+{
+
     /// <summary>
     /// 鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�
     /// </summary>
@@ -14,42 +14,42 @@
         /// 鐗╂枡鍚嶇О
         /// </summary>
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// ERP缂栧彿
         /// </summary>
         public virtual string ErpCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鍚嶇О
         /// </summary>
         public virtual string MaterialTypeName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鎻忚堪
         /// </summary>
         public virtual string MaterialTypeDescr { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷
         /// </summary>
         public virtual int? MaterialType { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缁�
         /// </summary>
         public virtual string MaterialGroup { get; set; }
-        
+
         /// <summary>
         /// ABC鍒嗙被鍚嶇О
         /// </summary>
         public virtual string ABCClassName { get; set; }
-        
+
 
         /// <summary>
         /// ABC鍒嗙被
@@ -61,85 +61,85 @@
         /// 鐗╂枡瑙勬牸
         /// </summary>
         public virtual string MaterialSpec { get; set; }
-        
+
         /// <summary>
         /// 榛樿鍏ュ簱搴撲綅
         /// </summary>
         public virtual string InPlaceCode { get; set; }
-        
+
         /// <summary>
         /// 搴撳瓨鍗曚綅
         /// </summary>
         public virtual string MaterialUnit { get; set; }
-        
+
         /// <summary>
         /// 閲囪喘鍗曚綅
         /// </summary>
         public virtual string POUnit { get; set; }
-        
+
         /// <summary>
         /// 棰滆壊
         /// </summary>
         public virtual string Color { get; set; }
-        
+
         /// <summary>
         /// 閲嶉噺
         /// </summary>
         public virtual string Weight { get; set; }
-        
+
         /// <summary>
         /// 鏍囧寘鏁伴噺
         /// </summary>
         public virtual decimal? SNP { get; set; }
-        
+
         /// <summary>
         /// 鎹㈢畻鐜�
         /// </summary>
         public virtual decimal? TranslateRate { get; set; }
-        
+
         /// <summary>
         /// 鎵规灞炴�ц鍒�
         /// </summary>
         public virtual long? BatchRuleId { get; set; }
-        
+
         /// <summary>
         /// 鎺у埗灞炴�ц鍒�
         /// </summary>
         public virtual long? ControlRuleId { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
         public virtual bool? IsDisabled { get; set; }
-        
+
         /// <summary>
         /// 鎻忚堪
         /// </summary>
         public virtual string MaterialDesc { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         public virtual List<string> CreatedTime { get; set; }
-        
+
         /// <summary>
         /// 鏇存柊鏃堕棿
         /// </summary>
         public virtual List<string> UpdatedTime { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鑰呭悕绉�
         /// </summary>
         public virtual string CreatedUserName { get; set; }
-        
+
         /// <summary>
         /// 淇敼鑰呭悕绉�
         /// </summary>
         public virtual string UpdatedUserName { get; set; }
-        
+
     }
 
-        /// <summary>
+    /// <summary>
     /// 鐗╂枡淇℃伅琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
     /// </summary>
     public class WmsMaterialSearchNonPage : PageInputNonPageBase
@@ -148,37 +148,37 @@
         /// 鐗╂枡鍚嶇О
         /// </summary>
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// ERP缂栧彿
         /// </summary>
         public virtual string ErpCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鍚嶇О
         /// </summary>
         public virtual string MaterialTypeName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鎻忚堪
         /// </summary>
         public virtual string MaterialTypeDescr { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷
         /// </summary>
         public virtual int? MaterialType { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缁�
         /// </summary>
         public virtual string MaterialGroup { get; set; }
-        
+
         /// <summary>
         /// ABC鍒嗙被鍚嶇О
         /// </summary>
@@ -193,82 +193,82 @@
         /// 鐗╂枡瑙勬牸
         /// </summary>
         public virtual string MaterialSpec { get; set; }
-        
+
         /// <summary>
         /// 榛樿鍏ュ簱搴撲綅
         /// </summary>
         public virtual string InPlaceCode { get; set; }
-        
+
         /// <summary>
         /// 搴撳瓨鍗曚綅
         /// </summary>
         public virtual string MaterialUnit { get; set; }
-        
+
         /// <summary>
         /// 閲囪喘鍗曚綅
         /// </summary>
         public virtual string POUnit { get; set; }
-        
+
         /// <summary>
         /// 棰滆壊
         /// </summary>
         public virtual string Color { get; set; }
-        
+
         /// <summary>
         /// 閲嶉噺
         /// </summary>
         public virtual string Weight { get; set; }
-        
+
         /// <summary>
         /// 鏍囧寘鏁伴噺
         /// </summary>
         public virtual decimal? SNP { get; set; }
-        
+
         /// <summary>
         /// 鎹㈢畻鐜�
         /// </summary>
         public virtual decimal? TranslateRate { get; set; }
-        
+
         /// <summary>
         /// 鎵规灞炴�ц鍒�
         /// </summary>
         public virtual long? BatchRuleId { get; set; }
-        
+
         /// <summary>
         /// 鎺у埗灞炴�ц鍒�
         /// </summary>
         public virtual long? ControlRuleId { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
         public virtual bool? IsDisabled { get; set; }
-        
+
         /// <summary>
         /// 鎻忚堪
         /// </summary>
         public virtual string MaterialDesc { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
-         public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-        
+        public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
         /// <summary>
         /// 鏇存柊鏃堕棿
         /// </summary>
-         public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-        
+        public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
+
         /// <summary>
         /// 鍒涘缓鑰呭悕绉�
         /// </summary>
         public virtual string CreatedUserName { get; set; }
-        
+
         /// <summary>
         /// 淇敼鑰呭悕绉�
         /// </summary>
         public virtual string UpdatedUserName { get; set; }
-        
+
     }
 
     /// <summary>
@@ -281,108 +281,108 @@
         /// </summary>
         [Required(ErrorMessage = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")]
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
         [Required(ErrorMessage = "鐗╂枡缂栧彿涓嶈兘涓虹┖")]
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// ERP缂栧彿
         /// </summary>
         public virtual string ErpCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鍚嶇О
         /// </summary>
         public virtual string MaterialTypeName { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷鎻忚堪
         /// </summary>
         public virtual string MaterialTypeDescr { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡绫诲瀷
         /// </summary>
-        public virtual int? MaterialType { get; set; }
-        
+        public virtual long? MaterialType { get; set; }
+
         /// <summary>
         /// 鐗╂枡缁�
         /// </summary>
         public virtual string MaterialGroup { get; set; }
-        
+
         /// <summary>
         /// ABC鍒嗙被鍚嶇О
         /// </summary>
         public virtual string ABCClassName { get; set; }
-        
+
         /// <summary>
         /// ABC鍒嗙被
         /// </summary>
         public virtual int? ABCClass { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡瑙勬牸
         /// </summary>
         public virtual string MaterialSpec { get; set; }
-        
+
         /// <summary>
         /// 榛樿鍏ュ簱搴撲綅
         /// </summary>
         public virtual string InPlaceCode { get; set; }
-        
+
         /// <summary>
         /// 搴撳瓨鍗曚綅
         /// </summary>
         public virtual string MaterialUnit { get; set; }
-        
+
         /// <summary>
         /// 閲囪喘鍗曚綅
         /// </summary>
         public virtual string POUnit { get; set; }
-        
+
         /// <summary>
         /// 棰滆壊
         /// </summary>
         public virtual string Color { get; set; }
-        
+
         /// <summary>
         /// 閲嶉噺
         /// </summary>
         public virtual string Weight { get; set; }
-        
+
         /// <summary>
         /// 鏍囧寘鏁伴噺
         /// </summary>
         public virtual decimal? SNP { get; set; }
-        
+
         /// <summary>
         /// 鎹㈢畻鐜�
         /// </summary>
         public virtual decimal? TranslateRate { get; set; }
-        
+
         /// <summary>
         /// 鎵规灞炴�ц鍒�
         /// </summary>
         public virtual long? BatchRuleId { get; set; }
-        
+
         /// <summary>
         /// 鎺у埗灞炴�ц鍒�
         /// </summary>
         public virtual long? ControlRuleId { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
         public virtual bool? IsDisabled { get; set; }
-        
+
         /// <summary>
         /// 鎻忚堪
         /// </summary>
         public virtual string MaterialDesc { get; set; }
-        
+
     }
 
     /// <summary>
@@ -409,19 +409,42 @@
         /// </summary>
         [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
         public long? Id { get; set; }
-        
+
     }
 
     /// <summary>
     /// 缂栬緫鐗╂枡涓氬姟淇℃伅瀹炰綋鍏ュ弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠e搧
     /// </summary>
-    public class UpdateWmsMaterialInfoInput : AddWmsMaterialInfoInput
+    public class UpdateWmsMaterialInfoInput
     {
+
         /// <summary>
-        /// Id涓婚敭
+        /// 鐗╂枡鍩虹淇℃伅
         /// </summary>
-        [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
-        public long? Id { get; set; }
+        public UpdateWmsMaterialInput MaterialInput { get; set; }
+
+        /// <summary>
+        /// 鎺у埗灞炴�ц鍒橧D
+        /// </summary>
+        public long? ControlRuleld { get; set; }
+
+        /// <summary>
+        /// 鏇夸唬鍝�
+        /// </summary>
+        public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
+
+        ///// <summary>
+        ///// 寰�鏉ュ崟浣�
+        ///// </summary>
+        //public List<BaseCustomerInput> BaseCustomerList { get; set; }
+
+
+        /// <summary>
+        /// 瀹㈡埛妗f锛堝線鏉ュ崟浣嶏級ID鍒楄〃
+        /// </summary>
+        public List<long> BaseCustomerList { get; set; }
+
+    
     }
 
     /// <summary>
@@ -452,10 +475,19 @@
         /// </summary>
         public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
 
+        ///// <summary>
+        ///// 寰�鏉ュ崟浣�
+        ///// </summary>
+        //public List<BaseCustomerInput> BaseCustomerList { get; set; }
+
+
         /// <summary>
-        /// 瀹㈡埛妗f
+        /// 瀹㈡埛妗f锛堝線鏉ュ崟浣嶏級ID鍒楄〃
         /// </summary>
-        public List<BaseCustomerInput> BaseCustomerList   { get; set; }
+        public List<long> BaseCustomerList { get; set; }
     }
 
+
+
+
 }

--
Gitblit v1.9.3