ZhongRui/ALDbanyunxiangmu.git

			@@ -111,7 +111,7 @@
			public string SupplyCode { get; set; }

			[SugarColumn(ColumnName = "lineNo", ColumnDescription = "è¡å·")]
			public string? lineNo { get; set; }
			public string lineNo { get; set; }

			public string WarehouseCode { get; set; }
			/// <summary>
			@@ -120,33 +120,43 @@
			[SugarColumn(IsNullable = false, ColumnDescription = "ç¶æ")]
			public int Status { get; set; }

			[SugarColumn(Length = 100)]
			[SugarColumn(Length = 100, ColumnDescription = "å½åæ¡ç ")]
			public string CurrentBarcode { get; set; } // å½åæ¡ç ï¼æååå¯è½ååï¼

			[SugarColumn(IsNullable = false, ColumnDescription = "åå§éå®æ°é")]
			public decimal OriginalLockQuantity { get; set; } // åå§éå®æ°é
			public int IsSplitted { get; set; } // æ¯å¦å·²æå 0-å¦ 1-æ¯

			[SugarColumn( ColumnDescription = "æåç¶éå®Id")]
			public int? ParentLockId { get; set; }

			[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "æä½è")]
			public string Operator { get; set; }


			[SugarColumn( ColumnDescription = "ç©ææ¡ç æ°é")]
			public decimal BarcodeQty { get; set; }

			[SugarColumn(ColumnDescription = "ç©æåä½")]
			public string BarcodeUnit { get; set; }

			[SugarColumn(ColumnDescription = "åæ¹åºåºæ¹æ¬¡å·")]
			public string OutboundBatchNo { get; set; }

			[Navigate(NavigateType.OneToOne, nameof(StockInfo))]//ä¸å¯¹ä¸ SchoolIdæ¯StudentAç±»éé¢ç
			public Dt_StockInfo StockInfo { get; set; } //ä¸è½èµå¼åªè½æ¯null

			[SugarColumn(ColumnDescription = "æ¯å¦åé")]
			public int IsUnallocated { get; set; } = 0;

			[SugarColumn(ColumnDescription = "ååº")]
			public string FactoryArea { get; set; }

			/// <summary>
			/// å©ä½æ°é
			/// </summary>
			[SqlSugar.SugarColumn(IsIgnore = true)]

			public decimal RemainQuantity => AssignQuantity - PickedQty;


			public int ReturnToMESStatus { get; set; }

			}