ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -58,15 +58,23 @@
			[ImporterHeader(Name = "åºåæ°")]
			[ExporterHeader(DisplayName = "åºåæ°")]
			[SugarColumn(IsNullable = false, ColumnDescription = "åºåæ°")]
			public float StockQuantity { get; set; }
			public decimal StockQuantity { get; set; }

			/// <summary>
			/// åºåºæ°ï¼åç©æåæ¹æ¬¡æ»åï¼
			/// å¾åºåºæ°ï¼åç©æåæ¹æ¬¡æ»åï¼
			/// </summary>
			[ImporterHeader(Name = "åºåºæ°")]
			[ExporterHeader(DisplayName = "åºåºæ°")]
			[SugarColumn(IsNullable = false, ColumnDescription = "åºåºæ°", DefaultValue = "0")]
			public float OutboundQuantity { get; set; }
			[ImporterHeader(Name = "å¾åºåºæ°")]
			[ExporterHeader(DisplayName = "å¾åºåºæ°")]
			[SugarColumn(IsNullable = false, ColumnDescription = "å¾åºåºæ°", DefaultValue = "0")]
			public decimal OutboundQuantity { get; set; }


			/// <summary>
			/// å¯ç¨åºåæ°é =å®éåºåæ°-å¾åºåºæ°é
			/// </summary>
			[SugarColumn(IsNullable = false, ColumnDescription = "å¯ç¨åºåæ°é", DefaultValue = "0")]
			public decimal AvailableQuantity { get; set; }


			/// <summary>
			/// çç¹æ°ï¼çç¹åå®éæ°éï¼åç©æåæ¹æ¬¡æ»åï¼
			@@ -74,7 +82,7 @@
			[ImporterHeader(Name = "çç¹æ°")]
			[ExporterHeader(DisplayName = "çç¹æ°")]
			[SugarColumn(IsNullable = false, ColumnDescription = "çç¹æ°", DefaultValue = "0")]
			public float SupplyQuantity { get; set; }
			public decimal SupplyQuantity { get; set; }

			/// <summary>
			/// ERPå®éåºåæ°
			@@ -82,7 +90,7 @@
			[ImporterHeader(Name = "ERPå®éåºåæ°")]
			[ExporterHeader(DisplayName = "ERPå®éåºåæ°")]
			[SugarColumn(IsNullable = false, ColumnDescription = "ERPå®éåºåæ°")]
			public float ERPStockQuantity { get; set; }
			public decimal ERPStockQuantity { get; set; }

			/// <summary>
			/// åºåå·®å¼ï¼åºåæ°ä¸ERPå®éåºåæ°æ¯å¦ç¸ç
			@@ -107,7 +115,7 @@
			[ImporterHeader(Name = "æææè³")]
			[ExporterHeader(DisplayName = "æææè³")]
			[SugarColumn(IsNullable = true, ColumnDescription = "æææè³")]
			public string ValidityPeriod { get; set; }
			public DateTime ValidityPeriod { get; set; }

			/// <summary>
			/// å¤æ³¨