From cb3c9098f3ed921918162a31b82bf3009383b917 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 11 十二月 2024 14:39:39 +0800
Subject: [PATCH] 字段修改

---
 MESApplication/bin/Release/net8.0/MESApplication.exe                |    0 
 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb        |    0 
 MESApplication/bin/Debug/net8.0/MES.Service.pdb                     |    0 
 MESApplication/bin/Release/net8.0/MESApplication.xml                |   84 +++++++++++++++++++-
 MESApplication/bin/Release/net8.0/publish/MESApplication.dll        |    0 
 MESApplication/bin/Debug/net8.0/MES.Service.dll                     |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.pdb                  |    0 
 MESApplication/bin/Release/net8.0/MES.Service.dll                   |    0 
 MESApplication/bin/Release/net8.0/MESApplication.dll                |    0 
 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb           |    0 
 MESApplication/bin/Release/net8.0/MES.Service.pdb                   |    0 
 MESApplication/bin/Release/net8.0/publish/MESApplication.exe        |    0 
 MESApplication/bin/Release/net8.0/MESApplication.pdb                |    0 
 MES.Service/bin/Debug/net8.0/MES.Service.pdb                        |    0 
 MESApplication/bin/Release/net8.0/publish/MES.Service.dll           |    0 
 MESApplication/bin/Release/net8.0/publish/MESApplication.xml        |   84 +++++++++++++++++++-
 MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs         |    7 +
 MESApplication/bin/Debug/net8.0/MESApplication.dll                  |    0 
 MES.Service/bin/Debug/net8.0/MES.Service.dll                        |    0 
 MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs                       |    1 
 MESApplication/MESApplication.csproj.user                           |    2 
 MES.Service/Dto/webApi/ErpSalesReturnDto.cs                         |    1 
 MES.Service/Modes/SalesDeliveryNotice.cs                            |    7 +
 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user |    4 
 MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs                 |   12 +-
 MESApplication/bin/Debug/net8.0/MESApplication.exe                  |    0 
 MES.Service/bin/Release/net8.0/MES.Service.dll                      |    0 
 MES.Service/bin/Release/net8.0/MES.Service.pdb                      |    0 
 MES.Service/service/BasicData/SalesReturnNoticeManager.cs           |    3 
 MES.Service/Modes/SalesReturnNotice.cs                              |    5 +
 30 files changed, 184 insertions(+), 26 deletions(-)

diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 9ec8308..60c9165 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -5,8 +5,8 @@
     public string? Type { get; set; }
     public string? F_UNW_Text_xsddh { get; set; }  // 閿�鍞鍗曞彿
     public string? FMaterialId { get; set; }  // 鐗╂枡缂栫爜
-    public string? FMaterialName { get; set; }  // 鐗╂枡鍚嶇О
-    public string? FMaterialModel { get; set; }  // 瑙勬牸鍨嬪彿
+    //public string? FMaterialName { get; set; }  // 鐗╂枡鍚嶇О
+    //public string? FMaterialModel { get; set; }  // 瑙勬牸鍨嬪彿
     public string? FUnitID { get; set; }  // 閿�鍞崟浣�
     public string? FQty { get; set; }  // 閿�鍞暟閲�
     public string? FIsFree { get; set; }  // 鏄惁璧犲搧
@@ -14,12 +14,12 @@
     public string? FStockId { get; set; }  // 浠撳簱
     public string? FMtoNo { get; set; }  // 璁″垝璺熻釜鍙�
     public string? FLot { get; set; }  // 鎵瑰彿
-    public string? FEntryDescription { get; set; }  // 澶囨敞
-    public string? FRmType { get; set; }  // 閫�璐х被鍨�
+    //public string? FEntryDescription { get; set; }  // 澶囨敞
+    //public string? FRmType { get; set; }  // 閫�璐х被鍨�
     public string? F_UNW_Base_GDY { get; set; }  // 璺熷崟鍛�
     public string? FStockUnitID { get; set; }  // 搴撳瓨鍗曚綅
     public decimal? FStockQty { get; set; }  // 搴撳瓨鏁伴噺
-    public string? FMaterialType { get; set; }  // 鐗╂枡绫诲埆
+   // public string? FMaterialType { get; set; }  // 鐗╂枡绫诲埆
     public string? FOwnerTypeID { get; set; }  // 璐т富绫诲瀷
     public string? FOwnerId { get; set; }  // 璐т富
     public string? FSrcType { get; set; }  // 婧愬崟绫诲瀷
@@ -39,8 +39,6 @@
     public string? FTerminateDate { get; set; }  // 涓氬姟缁堟鏃ユ湡
     public decimal? FSumOutQty { get; set; }  // 绱鍑哄簱鏁伴噺
     public decimal? FRemainOutQty { get; set; }  // 鏈嚭搴撴暟閲�
-
-
 
     public string? ErpID { get; set; }  // ERPID
     public string? EHID { get; set; }  // ERP澶碔D
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
index d30651b..b117617 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
@@ -40,5 +40,6 @@
     public string? FCancelStatus { get; set; } // 浣滃簾鐘舵��
     public string? FCancellerId { get; set; } // 浣滃簾浜�
     public string? FCancelDate { get; set; } // 浣滃簾鏃ユ湡
+    public string? FDocumentStatus { get; set; } // 鍗曟嵁鐘舵��
 
 }
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
index a6929ee..221f20b 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDto.cs
@@ -38,4 +38,5 @@
     public string? FCancellerId { get; set; } // 浣滃簾浜�
     public string? FCancelDate { get; set; } // 浣滃簾鏃ユ湡
     public string? FBillCloseStatus { get; set; } // 鍏抽棴鐘舵��
+    public string? FDocumentStatus { get; set; } // 鍗曟嵁鐘舵��
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesDeliveryNotice.cs b/MES.Service/Modes/SalesDeliveryNotice.cs
index 5a51d7a..7027191 100644
--- a/MES.Service/Modes/SalesDeliveryNotice.cs
+++ b/MES.Service/Modes/SalesDeliveryNotice.cs
@@ -225,5 +225,12 @@
         ///</summary>
          [SugarColumn(ColumnName="ERP_ID"    )]
          public string ErpId { get; set; }
+
+        /// <summary>
+        /// 鍗曟嵁鐘舵�� 
+        ///</summary>
+        [SugarColumn(ColumnName = "BILL_STATUS")]
+        public string BillStatus { get; set; }
+
     }
 }
diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
index b2a8115..3ca8eb3 100644
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ b/MES.Service/Modes/SalesReturnNotice.cs
@@ -205,5 +205,10 @@
         ///</summary>
         [SugarColumn(ColumnName = "ERP_ID")]
         public string ErpId { get; set; }
+        /// <summary>
+        /// 鍗曟嵁鐘舵�� 
+        ///</summary>
+        [SugarColumn(ColumnName = "BILL_STATUS")]
+        public string BillStatus { get; set; }
     }
 }
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index cd0897f..e49d9be 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index ae04c86..0578a6e 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 56af258..9642463 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index a7b6066..7c75f47 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index c1c3e48..99f79d2 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -142,6 +142,7 @@
                 CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
                 CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
                 CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
+                BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
 
             };
 
@@ -181,8 +182,8 @@
                     ErpHeadId = erpDto.EHID,//ERP澶碔D
                     SalesOrderId = erpDto.F_UNW_Text_xsddh,//閿�鍞鍗曞彿
                     MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
-                    MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
-                    MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
+                   // MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
+                    //MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
                     SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
                     SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
                     IsFree = erpDto.FIsFree,//鏄惁璧犲搧
@@ -195,7 +196,7 @@
                     OwnerId = erpDto.FOwnerIdHead,//璐т富
                     InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
                     InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
-                    MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
+                    //MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
                     PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//璁″垝鍙戣揣鏃ユ湡
                     OutLmtUnit = erpDto.FOutLmtUnit,//瓒呭彂鎺у埗鍗曚綅
                     OutMaxQty = erpDto.FOutMaxQty,//鍑哄簱涓婇檺
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index d715bf2..41c8c09 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -135,7 +135,8 @@
             CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
             CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
             CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
-         
+            BillStatus  = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
+
         };
 
         var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index dfe1ae2..1e27644 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
-    <NameOfLastUsedPublishProfile>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>F:\F鐩樻闈笓灞瀄椤圭洰浠g爜绠$悊鏂囦欢澶筡涓婃牸椤圭洰\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index fc79071..398d3c5 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
 -->
 <Project>
   <PropertyGroup>
-    <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
-    <History>True|2024-11-26T01:07:33.5654976Z||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+    <_PublishTargetUrl>F:\F鐩樻闈笓灞瀄椤圭洰浠g爜绠$悊鏂囦欢澶筡涓婃牸椤圭洰\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+    <History>True|2024-12-06T08:11:01.2090466Z;True|2024-11-26T09:07:33.5654976+08:00;True|2024-11-20T15:49:27.1100474+08:00;True|2024-11-16T18:18:42.4224922+08:00;True|2024-11-15T09:32:12.6287354+08:00;True|2024-11-13T10:19:32.3283327+08:00;True|2024-09-06T14:40:56.3762241+08:00;True|2024-08-20T17:12:00.2924570+08:00;True|2024-08-17T10:57:05.6670396+08:00;True|2024-08-17T10:56:46.8068041+08:00;True|2024-08-16T14:09:17.0526491+08:00;True|2024-08-15T08:40:32.8134665+08:00;True|2024-08-14T10:00:27.7017207+08:00;True|2024-08-14T08:54:44.8284031+08:00;True|2024-08-07T10:32:10.3689256+08:00;True|2024-08-05T15:45:03.0864530+08:00;True|2024-08-03T09:59:13.7916520+08:00;True|2024-07-31T17:27:28.1965929+08:00;True|2024-07-31T15:27:34.7943845+08:00;True|2024-07-30T15:04:50.5849235+08:00;True|2024-07-30T14:09:06.2877325+08:00;True|2024-07-29T16:11:30.4493940+08:00;True|2024-07-23T14:30:34.4591002+08:00;True|2024-07-22T14:17:39.8186158+08:00;True|2024-04-10T12:55:31.3963752+08:00;True|2024-04-08T13:59:25.5487203+08:00;True|2024-04-06T09:30:09.5350539+08:00;True|2024-04-06T08:46:05.8814658+08:00;True|2024-04-05T14:06:52.0448024+08:00;True|2024-04-05T12:47:46.0561601+08:00;True|2024-02-26T08:46:22.0988887+08:00;True|2024-02-24T19:17:13.6770376+08:00;True|2024-02-24T14:32:37.4450337+08:00;True|2024-02-23T10:22:06.5150173+08:00;True|2024-02-22T13:19:56.6997993+08:00;True|2024-02-22T10:53:17.7929585+08:00;True|2024-02-21T17:08:06.5553444+08:00;True|2024-02-19T16:24:37.4912012+08:00;True|2024-02-02T10:07:23.2726075+08:00;True|2024-02-02T08:36:49.2904460+08:00;True|2024-01-29T17:44:43.6800769+08:00;True|2024-01-23T09:47:26.7811926+08:00;True|2024-01-18T16:23:30.3373836+08:00;True|2024-01-17T14:22:04.2552286+08:00;True|2024-01-16T16:54:42.2316892+08:00;True|2024-01-16T16:37:23.8028858+08:00;True|2024-01-16T09:25:24.4007775+08:00;True|2024-01-15T10:18:57.3362616+08:00;True|2024-01-15T10:07:14.2044763+08:00;True|2024-01-10T14:03:36.4451130+08:00;True|2024-01-09T16:45:32.9601815+08:00;True|2024-01-06T14:16:34.2732220+08:00;True|2024-01-06T14:11:45.2134717+08:00;True|2024-01-06T11:30:58.9198887+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index cd0897f..e49d9be 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index ae04c86..0578a6e 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index ebd43c1..77f3f11 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index e4fe256..96df49c 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 719b7b9..6ec3962 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 56af258..9642463 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index a7b6066..7c75f47 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index e399378..7044121 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 1c73c99..96df49c 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 1ed54a4..f2b5480 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index 2968e69..c906c3c 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -606,37 +606,37 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList">
             <summary>
                 鑾峰彇鎵�鏈�
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)">
             <summary>
                 鏍规嵁涓婚敭鑾峰彇
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])">
             <summary>
                 鏍规嵁涓婚敭鍒犻櫎
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 娣诲姞
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 娣诲姞杩斿洖鑷
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 淇敼
             </summary>
@@ -750,6 +750,78 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
+            <summary>
+            鑾峰彇鎵�鏈�
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
+            <summary>
+            鏍规嵁涓婚敭鑾峰彇
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
+            <summary>
+            鏍规嵁涓婚敭鍒犻櫎
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            娣诲姞 
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            娣诲姞杩斿洖鑷
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            淇敼
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList">
+            <summary>
+            鑾峰彇鎵�鏈�
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)">
+            <summary>
+            鏍规嵁涓婚敭鑾峰彇
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])">
+            <summary>
+            鏍规嵁涓婚敭鍒犻櫎
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            娣诲姞 
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            娣诲姞杩斿洖鑷
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            淇敼
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList">
             <summary>
                 鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 56af258..9642463 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index a7b6066..7c75f47 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index e399378..7044121 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 1c73c99..96df49c 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 1ed54a4..f2b5480 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index 2968e69..c906c3c 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -606,37 +606,37 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList">
             <summary>
                 鑾峰彇鎵�鏈�
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)">
             <summary>
                 鏍规嵁涓婚敭鑾峰彇
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])">
             <summary>
                 鏍规嵁涓婚敭鍒犻櫎
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 娣诲姞
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 娣诲姞杩斿洖鑷
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
+        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
             <summary>
                 淇敼
             </summary>
@@ -750,6 +750,78 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
+            <summary>
+            鑾峰彇鎵�鏈�
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
+            <summary>
+            鏍规嵁涓婚敭鑾峰彇
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
+            <summary>
+            鏍规嵁涓婚敭鍒犻櫎
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            娣诲姞 
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            娣诲姞杩斿洖鑷
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
+            <summary>
+            淇敼
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList">
+            <summary>
+            鑾峰彇鎵�鏈�
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)">
+            <summary>
+            鏍规嵁涓婚敭鑾峰彇
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])">
+            <summary>
+            鏍规嵁涓婚敭鍒犻櫎
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            娣诲姞 
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            娣诲姞杩斿洖鑷
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)">
+            <summary>
+            淇敼
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList">
             <summary>
                 鑾峰彇鎵�鏈�

--
Gitblit v1.9.3