From 678e995cca52a9072c0a92a805060b4969d1010f Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 23 六月 2025 13:08:43 +0800
Subject: [PATCH] 修改发货通知单

---
 MESApplication/bin/Release/net8.0/MESApplication.exe                |    0 
 MES.Service/service/BasicData/MesStaffManager.cs                    |  154 +++++++++++---------------------------
 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb        |    0 
 MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs         |   13 ++
 MESApplication/bin/Debug/net8.0/MES.Service.pdb                     |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.dll                  |    0 
 MES.Service/bin/Debug/net8.0/MES.Service.dll                        |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.xml                  |   36 ---------
 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/Properties/PublishProfiles/FolderProfile.pubxml.user |    2 
 MESApplication/bin/Release/net8.0/MESApplication.dll                |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.exe                  |    0 
 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb           |    0 
 MES.Service/bin/Release/net8.0/MES.Service.dll                      |    0 
 MES.Service/Modes/SalesDeliveryNoticeDetail.cs                      |    6 +
 MESApplication/bin/Release/net8.0/MES.Service.pdb                   |    0 
 MESApplication/bin/Release/net8.0/publish/MESApplication.exe        |    0 
 MES.Service/bin/Release/net8.0/MES.Service.pdb                      |    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 
 24 files changed, 63 insertions(+), 148 deletions(-)

diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index fb36222..ab2fae4 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -199,6 +199,12 @@
         /// </summary>
         [SugarColumn(ColumnName = "F_KHWLBM")]
         public string? F_KHWLBM { get; set; }
+
+        /// <summary>
+        ///    鏄惁瀹岀粨
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_FINISH")]
+        public decimal? IsFinish { 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 b8abc21..ace4808 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 c4efc75..1ebf67e 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 6ddfb23..e743855 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 196a864..79526c6 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/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 9977229..9f05723 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -11,7 +11,6 @@
     public bool Save(ErpStaff unit)
     {
         var entity = GetMesStaff(unit); // 灏� ErpStaff 杞崲涓� MesStaff
-        var sysUser = GetUser(unit); // 鑾峰彇 SysUser 瀹炰緥
 
         return UseTransaction(db =>
         {
@@ -27,11 +26,11 @@
                     break;
                 case "2":
                 case "4":
-                    if (InsertOrUpdateStaff(db, sysUser, entity)) // 鎻掑叆鎴栨洿鏂板憳宸�
+                    if (InsertOrUpdateStaff(db, entity)) // 鎻掑叆鎴栨洿鏂板憳宸�
                         return 1;
                     break;
                 case "3":
-                    if (DeleteStaff(db, sysUser, entity.Id)) // 鍒犻櫎鍛樺伐
+                    if (DeleteStaff(db, entity.Id)) // 鍒犻櫎鍛樺伐
                         return 1;
                     break;
                 default:
@@ -44,46 +43,35 @@
     }
 
     // 鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
-    private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,
-        string status)
+    private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,string status)
     {
-        var result = db.Updateable<MesStaff>()
-            .SetColumns(s => s.FforbidStatus == status)
-            .Where(s => s.Id == staffId).ExecuteCommand();
+        var result = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => s.Id == staffId).ExecuteCommand();
 
         if (result > 0)
+        {
             return true;
-
+        }
         throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
     }
 
     // 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
-    private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
-        MesStaff entity)
+    private bool InsertOrUpdateStaff(SqlSugarScope db,MesStaff entity)
     {
-        var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid);
+        var exists = db.Queryable<MesStaff>().Any(u => u.StaffNo == entity.StaffNo);
         if (exists)
         {
-            var updateUser = db.Updateable<SysUser>()
-                .SetColumns(s => s.Fcode == sysUser.Fcode)
-                .SetColumns(s => s.Fname == sysUser.Fname)
-                .Where(s => s.Sid == sysUser.Sid)
-                .ExecuteCommand();
-            if (updateUser > 0)
+            var updateStaff = db.Updateable(entity).ExecuteCommand();
+            if (updateStaff > 0)
             {
-                var updateStaff = db.Updateable(entity).ExecuteCommand();
-                if (updateStaff > 0)
-                    return true;
+                return true;
             }
         }
         else
         {
-            var insertUser = db.Insertable(sysUser).ExecuteCommand();
-            if (insertUser > 0)
+            var insertStaff = db.Insertable(entity).ExecuteCommand();
+            if (insertStaff > 0)
             {
-                var insertStaff = db.Insertable(entity).ExecuteCommand();
-                if (insertStaff > 0)
-                    return true;
+                return true;
             }
         }
 
@@ -91,16 +79,12 @@
     }
 
     // 鍒犻櫎鍛樺伐鐨勬柟娉�
-    private bool DeleteStaff(SqlSugarScope db, SysUser sysUser, decimal staffId)
+    private bool DeleteStaff(SqlSugarScope db,decimal staffId)
     {
-        var deleteUser = db.Deleteable<SysUser>()
-            .Where(s => s.Sid == sysUser.Sid).ExecuteCommand();
-        if (deleteUser > 0)
+        var deleteStaff =db.Deleteable<MesStaff>().In(staffId).ExecuteCommand();
+        if (deleteStaff > 0)
         {
-            var deleteStaff =
-                db.Deleteable<MesStaff>().In(staffId).ExecuteCommand();
-            if (deleteStaff > 0)
-                return true;
+            return true;
         }
 
         throw new NotImplementedException("鍙嶅鏍稿け璐�");
@@ -125,48 +109,17 @@
         };
 
         if (staff.FStaffStartDate != null)
-            entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate,
-                "yyyy-MM-dd HH:mm:ss", null);
+        {
+            entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate, "yyyy-MM-dd HH:mm:ss", null);
+        }
 
         return entity;
-    }
-
-    // 灏� ErpStaff 瀵硅薄杞崲涓� SysUser 瀵硅薄鐨勬柟娉�
-    private SysUser GetUser(ErpStaff staff)
-    {
-        return new SysUser
-        {
-            Sid = Convert.ToDecimal(staff.Id),
-            Fcode = staff.FStaffNumber,
-            Fname = staff.FName,
-            Fpassword = "8+()./,", // 鍒濆瀵嗙爜
-            Fsystem = "娉拌幈濮�",
-            Lever = 0,
-            Fcompany = "1000",
-            Ffactory = "1000",
-            DelFlag = 0,
-            Dev=0,
-            Tet=0,
-            Prd=1,
-            Ismanager = 0,
-            Isacq = 0,
-            ExpField9 = "1020",
-            QmUser = 0,
-            Status = 0,
-            Isdeparture = 0,
-            CheckFlag = 0,
-            ExpFiel12 = 0,
-            FirstLogin = 0,
-            CreateDate = DateTime.Now,
-            PswEditTime = DateTime.Now
-        };
     }
 
     // SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜鍛樺伐璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
     public bool SaveList(List<ErpStaff> departments)
     {
         var list = new List<MesStaff>();
-        var userList = new List<SysUser>();
 
         departments.ForEach(s =>
         {
@@ -174,46 +127,36 @@
             entity.Type = s.Type;
             list.Add(entity);
 
-            var sysUser = GetUser(s);
-            sysUser.Type = s.Type;
-            userList.Add(sysUser);
         });
 
-        var groupBy = list.GroupBy(s => s.Type)
-            .ToDictionary(g => g.Key, g => g.ToList());
+        var groupBy = list.GroupBy(s => s.Type).ToDictionary(g => g.Key, g => g.ToList());
         return UseTransaction(db =>
         {
             foreach (var staffGroup in groupBy)
                 switch (staffGroup.Key)
                 {
                     case "0":
-                        if (!UpdateStaffStatusBatch(db, staffGroup.Value,
-                                "A")) // 鎵归噺鍚敤鍛樺伐
+                        if (!UpdateStaffStatusBatch(db, staffGroup.Value,"A")) // 鎵归噺鍚敤鍛樺伐
                             throw new NotImplementedException("鍚敤澶辫触");
                         break;
                     case "1":
-                        if (!UpdateStaffStatusBatch(db, staffGroup.Value,
-                                "B")) // 鎵归噺绂佺敤鍛樺伐
+                        if (!UpdateStaffStatusBatch(db, staffGroup.Value,"B")) // 鎵归噺绂佺敤鍛樺伐
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
                     case "2":
-                        if (!InsertStaffBatch(db, userList,
-                                staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐
+                        if (!InsertStaffBatch(db,staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐
                             throw new NotImplementedException("鎻掑叆澶辫触");
                         break;
                     case "3":
-                        if (!DeleteStaffBatch(db, userList,
-                                staffGroup.Value)) // 鎵归噺鍒犻櫎鍛樺伐
+                        if (!DeleteStaffBatch(db,staffGroup.Value)) // 鎵归噺鍒犻櫎鍛樺伐
                             throw new NotImplementedException("鍒犻櫎澶辫触");
                         break;
                     case "4":
-                        if (!InsertOrUpdateBatch(db, userList,
-                                staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
+                        if (!InsertOrUpdateBatch(db,staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
                             throw new NotImplementedException("鍚屾澶辫触");
                         break;
                     default:
-                        throw new ArgumentNullException(
-                            $"type娌℃湁{staffGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+                        throw new ArgumentNullException($"type娌℃湁{staffGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
                 }
 
             return 1;
@@ -221,25 +164,23 @@
     }
 
     // 鎵归噺鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
-    private bool UpdateStaffStatusBatch(SqlSugarScope db,
-        List<MesStaff> staffList, string status)
+    private bool UpdateStaffStatusBatch(SqlSugarScope db,List<MesStaff> staffList, string status)
     {
         var ids = staffList.Select(it => it.Id).ToArray();
-        var result = db.Updateable<MesStaff>()
-            .SetColumns(s => s.FforbidStatus == status)
-            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+        var result = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
 
         if (result > 0)
+        {
             return true;
+        }
 
         throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
     }
 
     // 鎵归噺鎻掑叆鍛樺伐鐨勬柟娉�
-    private bool InsertStaffBatch(SqlSugarScope db, List<SysUser> userList,
-        List<MesStaff> staffList)
+    private bool InsertStaffBatch(SqlSugarScope db,List<MesStaff> staffList)
     {
-        var userInsert = userList.FindAll(s => s.Type == "INSERT");
+        var userInsert = staffList.FindAll(s => s.Type == "INSERT");
         var executeCommand = db.Insertable(userInsert).ExecuteCommand();
         if (executeCommand > 0)
             if (db.Insertable(staffList).ExecuteCommand() > 0)
@@ -249,32 +190,27 @@
     }
 
     // 鎵归噺鍒犻櫎鍛樺伐鐨勬柟娉�
-    private bool DeleteStaffBatch(SqlSugarScope db, List<SysUser> userList,
-        List<MesStaff> staffList)
+    private bool DeleteStaffBatch(SqlSugarScope db, List<MesStaff> staffList)
     {
-        var sid = userList.FindAll(s => s.Type == "DELETE").Select(s => s.Sid)
-            .ToArray();
-        var result = db.Deleteable<SysUser>()
-            .Where(s => sid.Contains(s.Sid)).ExecuteCommand();
-
-        if (result > 0)
+        var ids = staffList.Select(it => it.Id).ToArray();
+        if (db.Deleteable<MesStaff>().In(ids).ExecuteCommand() > 0)
         {
-            var ids = staffList.Select(it => it.Id).ToArray();
-            if (db.Deleteable<MesStaff>().In(ids).ExecuteCommand() > 0)
-                return true;
+            return true;
         }
 
         throw new ArgumentNullException("鍙嶅鏍稿け璐�");
     }
 
     // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
-    private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
-        List<MesStaff> staffList)
+    private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesStaff> staffList)
     {
-        foreach (var sysUser in userList)
+        foreach (var staff in staffList)
         {
-            var entity = staffList.First(s => s.Id == sysUser.Sid);
-            if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
+            var entity = staffList.First(s => s.StaffNo == staff.StaffNo);
+            if (!InsertOrUpdateStaff(db, entity))
+            {
+                return false;
+            }
         }
 
         return true;
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index ab42549..95acca0 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -150,7 +150,6 @@
 
         {
             var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
-
             DateTime parsedDate;
             // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
             DateTime? ParseDateTime(string dateStr)
@@ -199,9 +198,19 @@
                     CustOrder    = erpDto.F_ZJXF_TEXT_QTR_LEE,//瀹㈡埛璁㈠崟鍙�
                     SalesContractNo = erpDto.FXSHTBH,//閿�鍞悎鍚岀紪鍙�
                     F_KHWLBM=erpDto.F_KHWLBM,
-                    F_KHWLMC=erpDto.F_KHWLMC
+                    F_KHWLMC=erpDto.F_KHWLMC,
+
                 };
 
+                if (erpDto.FRemainOutQty==0)
+                {
+                    salesOrderSub.IsFinish = 1;
+                }
+                else
+                {
+                    salesOrderSub.IsFinish = 0;
+                }
+
                 var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
                 if (single != null)
                 {
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index bf49d40..346142e 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>E:\Tool\TLM\TLM_JK\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
-    <History>True|2025-06-13T03:39:26.7350436Z||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+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||;</History>
+    <History>True|2025-06-23T03:21:29.8285053Z||;True|2025-06-23T10:42:44.4782901+08:00||;True|2025-06-13T11:39:26.7350436+08:00||;False|2025-06-13T11:38:43.8884292+08:00||;True|2025-06-13T11:00:43.8087373+08:00||;True|2025-05-16T15:10:24.9670924+08:00||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+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||;</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 b8abc21..ace4808 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 c4efc75..1ebf67e 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 6f74c1b..3b9ad49 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 25c899f..3a126b4 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 1536c50..d9bfecb 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/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 04e95d7..3fecfd7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -102,42 +102,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetList">
-            <summary>
-                鑾峰彇鎵�鏈�
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.GetById(System.Int32)">
-            <summary>
-                鏍规嵁涓婚敭鑾峰彇
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.DeleteByIds(System.Object[])">
-            <summary>
-                鏍规嵁涓婚敭鍒犻櫎
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Add(MES.Service.Modes.MesDeliveryNoteBarcode)">
-            <summary>
-                娣诲姞
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.InsertReturnIdentity(MES.Service.Modes.MesDeliveryNoteBarcode)">
-            <summary>
-                娣诲姞杩斿洖鑷
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteBarcodeController.Update(MES.Service.Modes.MesDeliveryNoteBarcode)">
-            <summary>
-                淇敼
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:MESApplication.Controllers.BasicData.MesDeliveryNoteController.GetList">
             <summary>
                 鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 6ddfb23..e743855 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 196a864..79526c6 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 bb20e26..ca5b0fa 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 26a68ab..3a126b4 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 1995386..199294d 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/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 6ddfb23..e743855 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 196a864..79526c6 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 bb20e26..ca5b0fa 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 26a68ab..3a126b4 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 1995386..199294d 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ

--
Gitblit v1.9.3