ZhongRui/ALDbanyunxiangmu.git

			@@ -8,11 +8,11 @@

			namespace WIDESEA_Model.Models
			{


			/// <summary>
			/// æ£éè®°å½è¡¨
			/// </summary>


			[SugarTable(nameof(Dt_PickingRecord), "æ£éè®°å½è¡¨")]

			public class Dt_PickingRecord : BaseEntity
			@@ -20,7 +20,7 @@
			[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
			public int Id { get; set; }

			public int TaskNo { get; set; }
			public int TaskNo { get; set; }
			public string OrderNo { get; set; }
			public int OrderDetailId { get; set; }

			@@ -44,11 +44,60 @@

			public int StockId { get; set; }

			public string BatchNo { get; set; }

			public bool IsCancelled { get; set; }

			public DateTime? CancelTime { get; set; }

			public string CancelOperator { get; set; }
			public string FactoryArea { get; set; }

			/// <summary>
			/// ä»åº
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "ä»åº")]
			public string? WarehouseCode { get; set; }
			/// <summary>
			/// è¡å·
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "lineNo", ColumnDescription = "è¡å·")]
			public string? lineNo { get; set; }
			/// <summary>
			/// ä¾åºåç¼å·
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "supplyCode", ColumnDescription = "ä¾åºåç¼å·")]
			public string? SupplyCode { get; set; }

			/// <summary>
			/// æ°é
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "barcodeQty", ColumnDescription = "æ°é")]
			public decimal BarcodeQty { get; set; }

			/// <summary>
			/// åä½
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "barcodeUnit", ColumnDescription = "åä½")]
			public string BarcodeUnit { get; set; } = null!;
			/// <summary>
			///
			/// é»è®¤å¼:
			///</summary>
			[SugarColumn(ColumnName = "barcodemoveQty", ColumnDescription = "æ°é")]
			public decimal BarcodeMoveQty { get; set; }

			public int ReturnToMESStatus { get; set; }

			public string FeedBackMesDocumentNo { get; set; }
			}



			/// <summary>
			/// ååºè®°å½è¡¨
			/// </summary>
			@@ -67,7 +116,7 @@
			/// ååºæ°é
			/// </summary>
			public decimal ReturnQty { get; set; }


			public DateTime ReturnTime { get; set; }
			/// <summary>
			/// 0-å¾ååº 1-å·²ååº
			@@ -79,7 +128,7 @@
			/// æåè®°å½è¡¨
			/// </summary>
			[SugarTable("Dt_SplitPackageRecord")]
			public class Dt_SplitPackageRecord: BaseEntity
			public class Dt_SplitPackageRecord : BaseEntity
			{
			[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
			public int Id { get; set; }
			@@ -88,11 +137,13 @@
			public string PalletCode { get; set; }
			public int StockId { get; set; }
			public bool IsReverted { get; set; } = false;

			public bool IsAutoSplit { get; set; } = false;
			public int OutStockLockInfoId { get; set; } // å³èçåºåºéå®ä¿¡æ¯
			public string OriginalBarcode { get; set; } // åæ¡ç
			public string NewBarcode { get; set; } // æ°æ¡ç

			public string FactoryArea { get; set; }

			public string FactoryArea { get; set; }
			/// <summary>
			/// æåæ°éï¼æ°æ¡ç æ°éï¼
			/// </summary>
			@@ -104,7 +155,40 @@
			public DateTime SplitTime { get; set; } = DateTime.Now;
			public string Operator { get; set; } // æä½äºº
			public int Status { get; set; } // ç¶æï¼1-å·²æå 2-å·²æ£é 3-å·²ååº

			public DateTime RevertTime { get; set; }

			public string RevertOperator { get; set; }
			public int PreviousSplitRecordId { get; set; }

			[SugarColumn(IsNullable = true)]
			public decimal? OriginalStockQuantity { get; set; }

			public decimal StockBeforeSplit { get; set; }
			public decimal AssignBeforeSplit { get; set; }
			}



			/// <summary>
			/// ç©ºç®±åèµ°è®°å½è¡¨
			/// </summary>
			public class Dt_EmptyPalletRemoval
			{
			[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
			public int Id { get; set; }

			public string OrderNo { get; set; }

			public string PalletCode { get; set; }

			public DateTime RemovalTime { get; set; }

			public string Operator { get; set; }

			public int CompletedItemsCount { get; set; }

			public decimal TotalPickedQuantity { get; set; }
			}


			}