From 68628c6cc163cddfcc745c225a9f3f34767261ef Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 22 十一月 2025 20:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
index 8700510..798a774 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_PickingRecord.cs"
@@ -20,7 +20,14 @@
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 
+        public int TaskNo { get; set; } 
+        public string OrderNo { get; set; }
         public int OrderDetailId { get; set; }
+
+        public string PalletCode { get; set; }
+
+        public int OutStockLockId { get; set; }
+        public string MaterielCode { get; set; }
 
         [SugarColumn(Length = 100)]
         public string Barcode { get; set; }
@@ -36,9 +43,12 @@
         public string LocationCode { get; set; }
 
         public int StockId { get; set; }
-    }
- 
 
+
+        public string FactoryArea { get; set; }
+    }
+
+ 
     /// <summary>
     /// 鍥炲簱璁板綍琛�
     /// </summary>
@@ -73,23 +83,38 @@
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
-
+        public string OrderNo { get; set; }
+        public int? TaskNum { get; set; }
+        public string PalletCode { get; set; }
+        public int StockId { get; set; }
+        public bool IsReverted { get; set; } = false;
         public int OutStockLockInfoId { get; set; } // 鍏宠仈鐨勫嚭搴撻攣瀹氫俊鎭�
         public string OriginalBarcode { get; set; } // 鍘熸潯鐮�
         public string NewBarcode { get; set; } // 鏂版潯鐮�
  
+        public string FactoryArea { get; set; } 
         /// <summary>
         /// 鎷嗗垎鏁伴噺锛堟柊鏉$爜鏁伴噺锛�
         /// </summary>
         public decimal SplitQty { get; set; }
- 
 
- 
+        public decimal RemainQuantity { get; set; }
+
         public string MaterielCode { get; set; } // 鐗╂枡缂栫爜
         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 int PreviousSplitRecordId { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public decimal? OriginalStockQuantity { get; set; }
+
+       public decimal StockBeforeSplit { get; set; }
+        public decimal AssignBeforeSplit { get; set; }
+    }
+ 
+
 }

--
Gitblit v1.9.3