From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
index cb961f5..88d134f 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
@@ -98,14 +98,14 @@
         }
 
         //鎻掑叆鎷撳睍
-        public async Task<long> InsertEx(AddAssetsPumpPartMainInput part, List<AddAssetsPumpPropContentInput> propcontents, AddAssetsPumpMainAndPartMapDto partmap)
+        public async Task<long> InsertEx(AddAssetsPumpPartMainInput part, List<AddAssetsPumpPropContentInput> propcontents, AddAssetsPumpMainAndPartMapInput partmap)
         {
             return await Task.Factory.StartNew(() =>
             {
                 var partmodel = part.Adapt<AddAssetsPumpPartMainInput, Model.AssetsPumpPartMain>();
                 partmodel.SortCode = _service.GetMaxSortCode() + 1;
                 var propcontentlistmodel = propcontents.Select(x => x.Adapt<AddAssetsPumpPropContentInput, Model.AssetsPumpPropContent>()).ToList();
-                var partmapmodel = partmap.Adapt<AddAssetsPumpMainAndPartMapDto, Model.AssetsPumpMainAndPartMap>();
+                var partmapmodel = partmap.Adapt<AddAssetsPumpMainAndPartMapInput, Model.AssetsPumpMainAndPartMap>();
                 var id = _service.InsertEX(partmodel, propcontentlistmodel, partmapmodel);
                 return id;
             });
@@ -243,16 +243,15 @@
 
         public async Task<bool> DeleteEx(long ID)
         {
-            /*          return await Task.Factory.StartNew(() =>
-                      {
-                          var bol = _service.DeleteExByID(ID);
-                          if (!bol)
-                          {
-                              throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
-                          }
-                          return true;
-                      });*/
-            return false;
+            return await Task.Factory.StartNew(() =>
+            {
+                var bol = _service.DeleteExByID(ID);
+                if (!bol)
+                {
+                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
+                }
+                return true;
+            });
         }
 
         /// <summary>

--
Gitblit v1.9.3