From a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API

---
 StandardPda/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs |   87 +++++++++++++++++++++----------------------
 1 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/StandardPda/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/StandardPda/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 5b8aae6..f72153e 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -3,47 +3,47 @@
 public class ErpSalesDeliveryDetailDto
 {
     /// <summary>
-    /// 鐗╂枡缂栫爜
+    ///     鐗╂枡缂栫爜
     /// </summary>
     public string? FMaterialId { get; set; }
 
     /// <summary>
-    /// 閿�鍞崟浣�
+    ///     閿�鍞崟浣�
     /// </summary>
     public string? FUnitID { get; set; }
 
     /// <summary>
-    /// 閿�鍞暟閲�
+    ///     閿�鍞暟閲�
     /// </summary>
     public string? FQty { get; set; }
 
     /// <summary>
-    /// 瑕佽揣鏃ユ湡
+    ///     瑕佽揣鏃ユ湡
     /// </summary>
     public string? FDeliveryDate { get; set; }
 
     /// <summary>
-    /// 婧愬崟鍗曞彿
+    ///     婧愬崟鍗曞彿
     /// </summary>
     public string? FSrcBillNo { get; set; }
 
     /// <summary>
-    /// ERPID
+    ///     ERPID
     /// </summary>
     public string? ErpID { get; set; }
 
     /// <summary>
-    /// ERP澶碔D
+    ///     ERP澶碔D
     /// </summary>
     public string? EHID { get; set; }
 
     /// <summary>
-    /// 瀹㈡埛鐗╂枡缂栫爜1
+    ///     瀹㈡埛鐗╂枡缂栫爜1
     /// </summary>
     public string? FMapId { get; set; }
 
     /// <summary>
-    /// 瀹㈡埛鐗╂枡鍚嶇О
+    ///     瀹㈡埛鐗╂枡鍚嶇О
     /// </summary>
     public string? FMapName { get; set; }
 
@@ -53,173 +53,172 @@
     // public string? FMapSpec { get; set; }  // 娉ㄩ噴鎺夌殑瀛楁
 
     /// <summary>
-    /// 浜よ揣鍦扮偣
+    ///     浜よ揣鍦扮偣
     /// </summary>
     public string? FDeliveryLoc { get; set; }
 
     /// <summary>
-    /// 浜よ揣鍦板潃
+    ///     浜よ揣鍦板潃
     /// </summary>
     public string? FDeliveryLAddress { get; set; }
 
     /// <summary>
-    /// 璁″垝鍑鸿揣鏃�
+    ///     璁″垝鍑鸿揣鏃�
     /// </summary>
     public string? FPlanDeliveryDate { get; set; }
 
     /// <summary>
-    /// 璐т富缁勭粐
+    ///     璐т富缁勭粐
     /// </summary>
     public string? FOwnerIdHead { get; set; }
 
     /// <summary>
-    /// 瀹㈡埛鏂欏彿2
+    ///     瀹㈡埛鏂欏彿2
     /// </summary>
     public string? FMapId2 { get; set; }
 
     /// <summary>
-    /// 椤圭洰
+    ///     椤圭洰
     /// </summary>
     public string? FProject { get; set; }
 
     /// <summary>
-    /// 瀛樺偍鍦扮偣
+    ///     瀛樺偍鍦扮偣
     /// </summary>
     public string? FStorageLocation { get; set; }
 
     /// <summary>
-    /// 鍏嶈垂鍝佺被鍨�
+    ///     鍏嶈垂鍝佺被鍨�
     /// </summary>
     public string? FFreeItemType { get; set; }
 
     /// <summary>
-    /// 琛ㄤ綋澶囨敞
+    ///     琛ㄤ綋澶囨敞
     /// </summary>
     public string? FBodyNote { get; set; }
 
     /// <summary>
-    /// 搴撳瓨鍙敤閲�
+    ///     搴撳瓨鍙敤閲�
     /// </summary>
     public decimal? FAvailableStock { get; set; }
 
     /// <summary>
-    /// 鏌ヨ搴撳瓨鏃堕棿
+    ///     鏌ヨ搴撳瓨鏃堕棿
     /// </summary>
     public string? FInventoryQueryTime { get; set; }
 
     /// <summary>
-    /// 琛岀姸鎬�
+    ///     琛岀姸鎬�
     /// </summary>
     public string? FLineStatus { get; set; }
 
     /// <summary>
-    /// 鏀惰揣鍦板潃鍏ㄧО
+    ///     鏀惰揣鍦板潃鍏ㄧО
     /// </summary>
     public string? FReceiveAddressFull { get; set; }
 
     /// <summary>
-    /// 鏀惰揣鑱旂郴浜�
+    ///     鏀惰揣鑱旂郴浜�
     /// </summary>
     public string? FReceiverContact { get; set; }
 
     /// <summary>
-    /// 鍙��鎹�
+    ///     鍙��鎹�
     /// </summary>
     public string? FReturnExchangeAllowed { get; set; }
 
     /// <summary>
-    /// 濮斿鍔犲伐浠舵暟閲�
+    ///     濮斿鍔犲伐浠舵暟閲�
     /// </summary>
     public decimal? FOutsourcedProcessQty { get; set; }
 
     /// <summary>
-    /// 鍙敤鏃ユ湡
+    ///     鍙敤鏃ユ湡
     /// </summary>
     public string? FAvailableDate { get; set; }
 
     /// <summary>
-    /// 鎵胯鏃ユ湡
+    ///     鎵胯鏃ユ湡
     /// </summary>
     public string? FCommitmentDate { get; set; }
 
     /// <summary>
-    /// 瀹㈡埛纭鍑鸿揣鏃�
+    ///     瀹㈡埛纭鍑鸿揣鏃�
     /// </summary>
     public string? FCustomerConfirmShipDate { get; set; }
 
     /// <summary>
-    /// 璁″垝缁勭粐
+    ///     璁″垝缁勭粐
     /// </summary>
     public string? FPlannedOrg { get; set; }
 
     /// <summary>
-    /// 渚涘簲鍟嗙洿杩�
+    ///     渚涘簲鍟嗙洿杩�
     /// </summary>
     public string? FVendorDirectShip { get; set; }
 
     /// <summary>
-    /// 渚涘簲鏉ユ簮
+    ///     渚涘簲鏉ユ簮
     /// </summary>
     public string? FSupplySource { get; set; }
 
     /// <summary>
-    /// 渚涘簲绫诲瀷
+    ///     渚涘簲绫诲瀷
     /// </summary>
     public string? FSupplyType { get; set; }
 
     /// <summary>
-    /// 渚涘簲缁勭粐
+    ///     渚涘簲缁勭粐
     /// </summary>
     public string? FSupplyOrg { get; set; }
 
     /// <summary>
-    /// 渚涘簲鍟�
+    ///     渚涘簲鍟�
     /// </summary>
     public string? FSupplier { get; set; }
 
     /// <summary>
-    /// 鍑鸿揣鏂瑰紡
+    ///     鍑鸿揣鏂瑰紡
     /// </summary>
     public string? FShippingMethod { get; set; }
 
     /// <summary>
-    /// MRP/DRP闇�姹�
+    ///     MRP/DRP闇�姹�
     /// </summary>
     public string? FMRPDR { get; set; }
 
     /// <summary>
-    /// 闇�姹傚垎绫�
+    ///     闇�姹傚垎绫�
     /// </summary>
     public string? FDemandCategory { get; set; }
 
     /// <summary>
-    /// 搴撳瓨瑙勫垝
+    ///     搴撳瓨瑙勫垝
     /// </summary>
     public string? FInventoryPlanning { get; set; }
 
     /// <summary>
-    /// 琛屽娉�
+    ///     琛屽娉�
     /// </summary>
     public string? FLineRemark { get; set; }
 
     /// <summary>
-    /// 鏉ユ簮鍗曟嵁绫诲埆
+    ///     鏉ユ簮鍗曟嵁绫诲埆
     /// </summary>
     public string? FSourceDocCategory { get; set; }
 
     /// <summary>
-    /// 鏉ユ簮鍗曞彿
+    ///     鏉ユ簮鍗曞彿
     /// </summary>
     public string? FSourceDocNo { get; set; }
 
     /// <summary>
-    /// 鏉ユ簮鍗曡鍙�
+    ///     鏉ユ簮鍗曡鍙�
     /// </summary>
     public decimal? FSourceDocLineNo { get; set; }
 
     /// <summary>
-    /// 琛屽彿
+    ///     琛屽彿
     /// </summary>
     public string? FLINE_NO { get; set; }
-
 }
\ No newline at end of file

--
Gitblit v1.9.3