From 70aa9b5ca249a84e5867912d551cdafbec76e54e Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期五, 05 十二月 2025 09:45:17 +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 |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 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 d642e34..02f07e6 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"
@@ -8,11 +8,11 @@
 
 namespace WIDESEA_Model.Models
 {
-    
+
     /// <summary>
     /// 鎷i�夎褰曡〃
     /// </summary>
- 
+
     [SugarTable(nameof(Dt_PickingRecord), "鎷i�夎褰曡〃")]
 
     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; }
 
@@ -93,6 +93,8 @@
         public decimal BarcodeMoveQty { get; set; }
 
         public int ReturnToMESStatus { get; set; }
+
+        public string FeedBackMesDocumentNo { get; set; }
     }
 
 
@@ -114,7 +116,7 @@
         /// 鍥炲簱鏁伴噺
         /// </summary>
         public decimal ReturnQty { get; set; }
-    
+
         public DateTime ReturnTime { get; set; }
         /// <summary>
         /// 0-寰呭洖搴� 1-宸插洖搴�
@@ -126,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; }
@@ -140,8 +142,8 @@
         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>
@@ -162,7 +164,7 @@
         [SugarColumn(IsNullable = true)]
         public decimal? OriginalStockQuantity { get; set; }
 
-       public decimal StockBeforeSplit { get; set; }
+        public decimal StockBeforeSplit { get; set; }
         public decimal AssignBeforeSplit { get; set; }
     }
 

--
Gitblit v1.9.3