增加交易唯一码，方便在网络状态不佳的情况下重新获取操作结果

UFIDA.U8.Framework.Api/Controllers/U8/AAController.cs

@@ -3,15 +3,14 @@ using Microsoft.Extensions.Caching.Memory;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Http;
-using Antlr.Runtime;
+using UFIDA.U8.Framework.Api.ControlObject.AA;
+using UFIDA.U8.Framework.Api.ControlObject.AA.U8PzInsert;
 using UFIDA.U8.Framework.Api.ControlObject.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Json;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
-using UFIDA.U8.Framework.Api.Entity;
 using UFIDA.U8.Framework.Api.Unit;
 
 // ReSharper disable InconsistentNaming
@@ -217,8 +216,8 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
             };
 
             return await BaseLoad(cAccId, "CustomerClass", dict, input);
-        }  
-        
+        }
+
         /// <summary>
         /// 查询人员档案
         /// </summary>
@@ -261,7 +260,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// </summary>
         /// <returns></returns>
         [NonAction]
-        public async Task<BaseResult<dynamic>> BaseLoad(string cAccId, string tableName,Dictionary<string,string> tables, [FromBody] Dictionary<string, object> input=null)
+        public async Task<BaseResult<dynamic>> BaseLoad(string cAccId, string tableName, Dictionary<string, string> tables, [FromBody] Dictionary<string, object> input = null)
         {
             var workId = SnowFlakeSingle.Instance.NextId();
 
@@ -306,7 +305,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     }
                 });
 
-                var colList = new Dictionary<string,string>();
+                var colList = new Dictionary<string, string>();
 
                 var query = db.Queryable<dynamic>();
                 var bFirst = true;
@@ -320,7 +319,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                     var cols = db.DbMaintenance.GetColumnInfosByTableName(table.Key);
 
-                    if(cols != null && cols.Count > 0)
+                    if (cols != null && cols.Count > 0)
                     {
                         foreach (var col in cols.Where(col => !colList.Any(a => string.Equals(a.Key, col.DbColumnName, StringComparison.CurrentCultureIgnoreCase))))
                         {
@@ -347,7 +346,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     {
                         if ($"{o.Value}".EndsWith("%") || $"{o.Value}".StartsWith("%"))
                         {
-                            if (colList.Any(a=>string.Equals(a.Key, o.Key,StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
+                            if (colList.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
                             {
                                 var col = colList.First(a =>
                                               string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) ||
@@ -432,5 +431,60 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
             }
         }
 
+        /// <summary>
+        /// 新增项目大类
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="cCardNum"></param>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("api/U8/AA/{cCardNum}/Add")]
+        public async Task<BaseResult<string>> Fitem_Add(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input)
+        {
+            try
+            {
+                var db = CommUnit.GetDbClient();
+
+                var workId = SnowFlakeSingle.Instance.NextId();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{cAccId},数据:{input.ToJson()}");
+
+                //LoginParamter param;
+
+                if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
+
+                    baseLogin = new BaseLogin();
+
+                    var param = await CommUnit.GetLoginParamter(cAccId);
+
+                    if (param == null)
+                    {
+                        throw new Exception("未能加载指定系统号的登录信息");
+                    }
+
+                    baseLogin.Init(param, false);
+
+                    _cache.Clear();
+
+                    _cache.Set($"U8_{cAccId}", baseLogin);
+                }
+
+                var co = new IFitem();
+
+                var res = await co.Transact(baseLogin, "", null);
+
+                return res;
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error(ex.Message, ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
     }
 }

UFIDA.U8.Framework.Api/Controllers/U8/DPController.cs

@@ -1,16 +1,11 @@
 using log4net;
-using Microsoft.Extensions.Hosting;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.ServiceModel;
 using System.Threading.Tasks;
-using System.Web;
 using System.Web.Http;
 using System.Web.Http.Description;
-using System.Web.UI.WebControls;
 using UFIDA.U8.Framework.Api.Common.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Common;
 using UFIDA.U8.Framework.Api.ControlObject.Entity;
@@ -45,7 +40,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         {
             try
             {
-                
+
                 _logInfo.Debug($"当前接口:api/U8/DP/Login,参数:{input.ToJson()}");
 
                 var db = CommUnit.GetDbClient();
@@ -64,7 +59,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     pDate = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today:yyyy-MM-dd}" : input.pDate,
                     pPassword = string.IsNullOrWhiteSpace(input.pPassword) ? "" : CommUnit.GetDecrypt(input.pPassword),
                     pYearId = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today.Year}" : $"{DateTime.Parse(input.pDate).Year}",
-                    pSubId =  "DP",
+                    pSubId = "DP",
                     pUserId = input.pUserId
                 };
 
@@ -366,7 +361,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpPost]
         [Route("api/U8/DP/UploadConfig")]
-        public async Task<BaseResult<string>> UploadConfig(string cKey,[FromBody] List<Dictionary<string,object>> inputs)
+        public async Task<BaseResult<string>> UploadConfig(string cKey, [FromBody] List<Dictionary<string, object>> inputs)
         {
             try
             {
@@ -389,7 +384,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 return new BaseResult<string> { bSuccess = false, message = "查询失败", result = ex.Message };
             }
-            
+
         }
 
         /// <summary>
@@ -405,7 +400,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
             {
                 var fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"App_Data/{cKey}.json");
 
-                var txt=File.ReadAllText(fileName );
+                var txt = File.ReadAllText(fileName);
 
                 return new BaseResult<string>()
                 {
@@ -458,9 +453,14 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
             }
         }
 
+        /// <summary>
+        /// 注册子系统
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         [Route("api/U8/DP/InitSubSystem")]
-        public async Task<BaseResult<long>> InitSubSystem(Dictionary<string,string> input)
+        public async Task<BaseResult<long>> InitSubSystem(Dictionary<string, string> input)
         {
             try
             {
@@ -476,7 +476,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     throw new Exception("当前子系统已注册");
                 }
 
-                info.Id=SnowFlakeSingle.instance.NextId();
+                info.Id = SnowFlakeSingle.instance.NextId();
 
                 await db.Insertable(info).ExecuteCommandAsync();
 
@@ -491,6 +491,52 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 return new BaseResult<long>() { bSuccess = false, message = "子系统初始化失败", result = 0 };
             }
-        } 
+        }
+
+        /// <summary>
+        /// 获取接口执行结果
+        /// </summary>
+        /// <param name="tradeid"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/AA/Result")]
+        [Route("api/U8/AP/Result")]
+        [Route("api/U8/DP/Result")]
+        [Route("api/U8/MO/Result")]
+        [Route("api/U8/PU/Result")]
+        [Route("api/U8/SA/Result")]
+        [Route("api/U8/SFC/Result")]
+        [Route("api/U8/SF/Result")]
+        [Route("api/U8/ST/Result")]
+        [Route("api/U8/Workflow/Result")]
+        public async Task<BaseResult<string>> Result(string tradeid)
+        {
+            try
+            {
+                var db = CommUnit.GetDbClient();
+
+                var entity = await db.Queryable<SysTradeResult>().Where(a=>a.cTradeId==tradeid).FirstAsync();
+
+                if (entity==null)
+                {
+                    throw new Exception($"未能找到请求ID:{tradeid}的结果");
+                }
+
+                if (entity.bRun == true)
+                {
+                    throw new Exception($"请求ID:{tradeid}正在执行");
+                }
+
+                return entity.cResult;
+
+            } catch (Exception ex) 
+            {
+                _logInfo.Error(ex.Message, ex);
+
+                return new BaseResult<string>() { bSuccess = false, message = ex.Message, result = ex.Message };
+            }
+
+            
+        }
     }
 }

UFIDA.U8.Framework.Api/Controllers/U8/MOController.cs

@@ -3,7 +3,6 @@ using Microsoft.Extensions.Caching.Memory;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Http;
@@ -11,7 +10,7 @@ using UFIDA.U8.Framework.Api.ControlObject.Common;
 using UFIDA.U8.Framework.Api.ControlObject.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Json;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
-using UFIDA.U8.Framework.Api.Entity;
+using UFIDA.U8.Framework.Api.ControlObject.U8M.MO;
 using UFIDA.U8.Framework.Api.Unit;
 
 namespace UFIDA.U8.Framework.Api.Controllers.U8
@@ -148,22 +147,6 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     }
                 }
 
-                cols = db.DbMaintenance.GetColumnInfosByTableName(cExtQName);
-
-                if (cols != null && cols.Count > 0)
-                {
-                    foreach (var col in cols.Where(col => !colList.ContainsKey(col.DbColumnName.ToLower())))
-                    {
-                        if (!colList.ContainsKey(col.DbColumnName.ToLower()))
-                        {
-                            if (cCardPostion == "B" || cCardPostion == "L")
-                                colList.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]");
-
-                            colListBody.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]");
-                        }
-                    }
-                }
-
                 if (db.DbMaintenance.IsAnyTable(cBWTblExtName))
                 {
                     bExtBody = true;
@@ -174,16 +157,46 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     {
                         foreach (var col in extcols)
                         {
-                            if (colList.ContainsKey(col.DbColumnName.ToLower()))
+                            if (colListBody.ContainsKey(col.DbColumnName.ToLower()))
                             {
                                 vouchersIdFieldName = col.DbColumnName.ToLower();
                             }
                             else
                             {
-                                if (cCardPostion == "B" || cCardPostion == "L")
+                                if ((cCardPostion == "B" || cCardPostion == "L") && !colList.ContainsKey(col.DbColumnName.ToLower()) && !string.IsNullOrWhiteSpace(col.DbColumnName))
                                     colList.Add(col.DbColumnName.ToLower(), $"{cBWTblExtName}.[{col.DbColumnName}]");
 
-                                colListBody.Add(col.DbColumnName.ToLower(), $"{cBWTblExtName}.[{col.DbColumnName}]");
+                                if (!colListBody.ContainsKey(col.DbColumnName.ToLower()) && !string.IsNullOrWhiteSpace(col.DbColumnName))
+                                {
+                                    colListBody.Add(col.DbColumnName.ToLower(), $"{cBWTblExtName}.[{col.DbColumnName}]");
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (cCardNum == "MO21")
+                {
+                    cols = db.DbMaintenance.GetColumnInfosByTableName(cExtQName);
+
+                    if (cols != null && cols.Count > 0)
+                    {
+                        if (string.IsNullOrWhiteSpace(vouchersIdFieldName))
+                        {
+                            vouchersIdFieldName = "modid";
+                        }
+
+                        foreach (var col in cols.Where(col => !colList.ContainsKey(col.DbColumnName.ToLower())))
+                        {
+                            if (!colList.ContainsKey(col.DbColumnName.ToLower()))
+                            {
+                                if ((cCardPostion == "B" || cCardPostion == "L") && !string.IsNullOrWhiteSpace(col.DbColumnName))
+                                    colList.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]");
+                            }
+
+                            if (!colListBody.ContainsKey(col.DbColumnName.ToLower()) && !string.IsNullOrWhiteSpace(col.DbColumnName))
+                            {
+                                colListBody.Add(col.DbColumnName.ToLower(), $"{cExtQName}.[{col.DbColumnName}]");
                             }
                         }
                     }
@@ -202,7 +215,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 if (cCardNum == "MO21")
                 {
-                    query.AddJoinInfo(cExtQName, cExtQName, $"{cBWQName}.[{vouchersIdFieldName}]={cExtQName}.[{vouchersIdFieldName}]");
+                    query.AddJoinInfo(cExtQName, cExtQName, $"[{cBWQName}].[{vouchersIdFieldName}]=[{cExtQName}].[{vouchersIdFieldName}]");
                 }
 
                 if (bExtBody)
@@ -391,5 +404,871 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                 return new BaseResult<dynamic> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
             }
         }
+
+        [HttpPost]
+        [Route("api/U8/MO/Save/{cCardNum}")]
+        public async Task<BaseResult<string>> Save(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bVerify = false)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+
+            try
+            {
+                if (cCardNum == "MO39")
+                {
+                    return await MO39_Save(cAccId, input, bVerify);
+                }
+
+                throw new Exception($"当前接口未实现");
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+
+        }
+
+        /// <summary>
+        /// 保存补料申请单
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="input"></param>
+        /// <param name="bVerify"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("api/U8/MO/MO39/Save")]
+        public async Task<BaseResult<string>> MO39_Save(string cAccId, [FromBody] Dictionary<string, object> input, bool bVerify = false)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_SaveToekn(input, bVerify);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/Save,单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+                BaseResult<string> res;
+
+                if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
+                {
+                    var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
+
+                    _logInfo.Debug($"作业Id:{workId}-----开始保存(批量)");
+                    //res = bo.Save(baseLogin, cCardNum, inputs);
+                    res = new BaseResult<string>() { bSuccess = false, message = "当前接口未实现当前方法" };
+                    _logInfo.Debug($"作业Id:{workId}-----结束保存(批量)");
+                }
+                else
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----开始保存");
+                    res = bo.Save(baseLogin, cCardNum, input, bVerify);
+                    _logInfo.Debug($"作业Id:{workId}-----结束保存");
+                }
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 保存补料申请单
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="input"></param>
+        /// <param name="bVerify"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("api/U8/MO/MO39/Save/Token")]
+        public async Task<BaseResult<string>> MO39_SaveToekn([FromBody] Dictionary<string, object> input, bool bVerify = false)
+        {
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/Save/{userToken},参数:{input.ToJson()}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                var workId = SnowFlakeSingle.Instance.NextId();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},数据:{input.ToJson()}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+                BaseResult<string> res;
+
+                if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
+                {
+                    var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
+
+                    _logInfo.Debug($"作业Id:{workId}-----开始保存(批量)");
+                    //res = bo.Save(baseLogin, cCardNum, inputs);
+                    res = new BaseResult<string>() { bSuccess = false, message = "当前接口未实现当前方法" };
+                    _logInfo.Debug($"作业Id:{workId}-----结束保存(批量)");
+                }
+                else
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----开始保存");
+                    res = bo.Save(baseLogin, cCardNum, input, bVerify);
+                    _logInfo.Debug($"作业Id:{workId}-----结束保存");
+                }
+
+                baseLogin.ShutDown();
+
+                return res;
+
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error(ex.Message, ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 审核补料申请单(ID)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Verify/ID")]
+        public async Task<BaseResult<string>> MO39_Verify(string cAccId, int voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_VerifyToekn(voucherId);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/Verify/ID,单据类型编码:{cCardNum},单据ID:{voucherId}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始审核");
+                var res = bo.Verify(baseLogin, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束审核");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 审核补料申请单(ID)
+        /// </summary>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Verify/ID/Token")]
+        public async Task<BaseResult<string>> MO39_VerifyToekn(int voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/Verify/ID/{userToken},单据ID:{voucherId}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},单据ID:{voucherId}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始审核");
+                var res = bo.Verify(baseLogin, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束审核");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 弃审补料申请单(ID)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/UnVerify/ID")]
+        public async Task<BaseResult<string>> MO39_UnVerify(string cAccId, int voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_UnVerifyToekn(voucherId);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/UnVerify/ID,单据类型编码:{cCardNum},单据ID:{voucherId}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.UnVerify(baseLogin, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 弃审补料申请单(ID)
+        /// </summary>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/UnVerify/ID/Token")]
+        public async Task<BaseResult<string>> MO39_UnVerifyToekn(int voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/UnVerify/ID/{userToken},单据ID:{voucherId}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{output.cAccId},单据ID:{voucherId}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.UnVerify(baseLogin, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 删除补料申请单(ID)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Delete/ID")]
+        public async Task<BaseResult<string>> MO39_Delete(string cAccId, long voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_DeleteToekn(voucherId);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/Delete/ID,单据类型编码:{cCardNum},单据ID:{voucherId}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始删除");
+                var res = bo.Delete(baseLogin, cCardNum, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束删除");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 删除补料申请单(ID)
+        /// </summary>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Delete/ID/Token")]
+        public async Task<BaseResult<string>> MO39_DeleteToekn(long voucherId)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/Delete/ID/{userToken},单据ID:{voucherId}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{output.cAccId},单据ID:{voucherId}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.Delete(baseLogin, cCardNum, voucherId);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 审核补料申请单(单号)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Verify/Code")]
+        public async Task<BaseResult<string>> MO39_Verify(string cAccId, string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_VerifyToekn(voucherCode);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/Verify/Code,单据类型编码:{cCardNum},单据编号:{voucherCode}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始审核");
+                var res = bo.Verify(baseLogin, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束审核");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 审核补料申请单(单号)
+        /// </summary>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Verify/Code/Token")]
+        public async Task<BaseResult<string>> MO39_VerifyToekn(string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/Verify/Code/{userToken},单据编号:{voucherCode}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},单据编号:{voucherCode}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始审核");
+                var res = bo.Verify(baseLogin, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束审核");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 弃审补料申请单(单号)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/UnVerify/Code")]
+        public async Task<BaseResult<string>> MO39_UnVerify(string cAccId, string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_UnVerifyToekn(voucherCode);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/UnVerify/Code,单据类型编码:{cCardNum},单据编号:{voucherCode}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.UnVerify(baseLogin, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 弃审补料申请单(单号)
+        /// </summary>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/UnVerify/Code/Token")]
+        public async Task<BaseResult<string>> MO39_UnVerifyToekn(string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/UnVerify/Code/{userToken},单据编号:{voucherCode}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{output.cAccId},单据编号:{voucherCode}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.UnVerify(baseLogin, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 删除补料申请单(单号)
+        /// </summary>
+        /// <param name="cAccId"></param>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Delete/Code")]
+        public async Task<BaseResult<string>> MO39_Delete(string cAccId, string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+            try
+            {
+                try
+                {
+                    var userToken = Request.Headers.GetValues("userToken").First();
+
+                    if (!string.IsNullOrWhiteSpace(userToken))
+                    {
+                        return await MO39_DeleteToekn(voucherCode);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----userToken获取失败,错误信息:{ex.Message}");
+                }
+
+                _logInfo.Debug($"作业Id:{workId}-----当前接口:api/U8/MO/{cCardNum}/Delete/Code,单据类型编码:{cCardNum},单据编号:{voucherCode}");
+
+                if (cCardNum != "MO39")
+                    throw new Exception("当前接口不支持此类型的单据");
+
+                var baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                baseLogin.Init(param);
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始删除");
+                var res = bo.Delete(baseLogin, cCardNum, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束删除");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
+
+        /// <summary>
+        /// 删除补料申请单(单号)
+        /// </summary>
+        /// <param name="voucherCode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("api/U8/MO/MO39/Delete/Code/Token")]
+        public async Task<BaseResult<string>> MO39_DeleteToekn(string voucherCode)
+        {
+            var workId = SnowFlakeSingle.Instance.NextId();
+            var cCardNum = "MO39";
+
+            try
+            {
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/MO/{cCardNum}/Delete/Code/{userToken},单据编号:{voucherCode}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                var db = CommUnit.GetDbClient();
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{output.cAccId},单据编号:{voucherCode}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var bo = new ReplenishApply();
+
+                _logInfo.Debug($"作业Id:{workId}-----开始弃审");
+                var res = bo.Delete(baseLogin, cCardNum, voucherCode);
+                _logInfo.Debug($"作业Id:{workId}-----结束弃审");
+
+
+                baseLogin.ShutDown();
+
+                return res;
+
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error($"作业Id:{workId}-----错误信息:{ex.Message}", ex);
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+        }
     }
 }

UFIDA.U8.Framework.Api/Controllers/U8/PUController.cs

@@ -1,23 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Web.Http;
-using log4net;
+using log4net;
 using Microsoft.Extensions.Caching.Memory;
 using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
 using UFIDA.U8.Framework.Api.Common.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Common;
 using UFIDA.U8.Framework.Api.ControlObject.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Json;
 using UFIDA.U8.Framework.Api.ControlObject.PU;
-using UFIDA.U8.Framework.Api.ControlObject.ST;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
 using UFIDA.U8.Framework.Api.Models;
 using UFIDA.U8.Framework.Api.Unit;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
 
 namespace UFIDA.U8.Framework.Api.Controllers.U8
 {
@@ -25,7 +21,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
     /// 采购管理
     /// </summary>
     public class PUController : ApiController
-    {        
+    {
         /// <summary>
         /// 日志组件
         /// </summary>
@@ -49,7 +45,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpPost]
         [Route("api/U8/PU/{cCardNum}/VoucherSave")]
-        public async Task<BaseResult<string>> VoucherSave(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bPositive = true, string sBillType = null, string sBusType = "", int VoucherState = 2, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> VoucherSave(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bPositive = true, string sBillType = null, string sBusType = "", int VoucherState = 2, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -57,6 +53,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{cAccId},数据:{input.ToJson()}");
 
                 //LoginParamter param;
@@ -91,7 +94,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var defs = await db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "H" && s.bEnable == true).ToListAsync();  //查询表头字段配置,供后续设置字段值
 
-                
+
                 var newNumber = "";
                 var bGetCode = false;
                 var codeKey = "";
@@ -149,7 +152,11 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                var res = await co.VoucherSave(baseLogin, input, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), bPositive, sBillType, sBusType, VoucherState, UserMode, sOverDetailsXml, bGetCode, codeKey, voucherInfo.bVerify, voucherInfo.bPrintDom,voucherInfo.iswfcontrolled,voucherInfo.cFlowFieldName);
+                var res = await co.VoucherSave(baseLogin, input, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), bPositive, sBillType, sBusType, VoucherState, UserMode, sOverDetailsXml, bGetCode, codeKey, voucherInfo.bVerify, voucherInfo.bPrintDom, voucherInfo.iswfcontrolled, voucherInfo.cFlowFieldName);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
 
                 return res;
             }
@@ -157,7 +164,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+                var res = new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -175,7 +188,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/Confirm/Code")]
-        public async Task<BaseResult<string>> Confirm(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> Confirm(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -183,6 +196,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:审核,对接账套:{cAccId},单号:{cCode}");
 
                 //LoginParamter param;
@@ -217,13 +237,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.Confirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.Confirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -241,7 +273,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/Confirm/ID")]
-        public async Task<BaseResult<string>> Confirm(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> Confirm(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -249,6 +281,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:审核,对接账套:{cAccId},ID:{voucherId}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
@@ -277,13 +316,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.Confirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.Confirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -407,7 +458,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/CancelConfirm/Code")]
-        public async Task<BaseResult<string>> CancelConfirm(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> CancelConfirm(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -415,6 +466,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{cAccId},单号:{cCode}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin) || baseLogin == null)
@@ -443,13 +501,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.CancelConfirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.CancelConfirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -467,7 +537,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/CancelConfirm/ID")]
-        public async Task<BaseResult<string>> CancelConfirm(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> CancelConfirm(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -475,6 +545,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{cAccId},ID:{voucherId}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
@@ -503,13 +580,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.CancelConfirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.CancelConfirm(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -633,7 +722,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/Delete/Code")]
-        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -641,6 +730,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{cAccId},单号:{cCode}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin) || baseLogin == null)
@@ -669,13 +765,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.Delete(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.Delete(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -693,7 +801,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/Delete/ID")]
-        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -701,6 +809,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{cAccId},ID:{voucherId}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
@@ -729,13 +844,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.Delete(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.Delete(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -853,7 +980,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/SubmintWf/Code")]
-        public async Task<BaseResult<string>> SubmintWf(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> SubmintWf(string cAccId, string cCardNum, string cCode, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -861,6 +988,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:提交工作流,对接账套:{cAccId},单号:{cCode}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin) || baseLogin == null)
@@ -889,13 +1023,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.SubmintWf(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.SubmintWf(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), cCode, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "提交工作流失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "提交工作流失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -913,7 +1059,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <returns></returns>
         [HttpGet]
         [Route("api/U8/PU/{cCardNum}/SubmintWf/ID")]
-        public async Task<BaseResult<string>> SubmintWf(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null)
+        public async Task<BaseResult<string>> SubmintWf(string cAccId, string cCardNum, long voucherId, bool bPositive = true, string sBillType = null, string sBusType = null, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, string tradeid = null)
         {
             try
             {
@@ -921,6 +1067,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:提交工作流,对接账套:{cAccId},ID:{voucherId}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
@@ -949,13 +1102,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new clsVoucherCO_PU();
 
-                return await co.SubmintWf(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+                var res = await co.SubmintWf(baseLogin, cCardNum, (vouchertype)Convert.ToInt32(voucherInfo.VoucherType), voucherId, bPositive, sBillType, sBusType, UserMode, sOverDetailsXml);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "提交工作流失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "提交工作流失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -1103,7 +1268,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 if (vouchers == null)
                 {
-                    throw new Exception("未能获取到单据配置信息");   
+                    throw new Exception("未能获取到单据配置信息");
                 }
 
                 var db = new SqlSugarClient(new ConnectionConfig()
@@ -1122,7 +1287,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                 var cBWQName = vouchers.cBWQName;
 
                 var cBTTblExtName = $"{vouchers.cBTTblName}_extradefine";
-                var cBWTblExtName =$"{vouchers.cBWTblName}_extradefine" ;
+                var cBWTblExtName = $"{vouchers.cBWTblName}_extradefine";
 
                 var voucherIdFieldName = vouchers.voucherIdFieldName;
                 var vouchersIdFieldName = "";
@@ -1136,14 +1301,14 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var cols = db.DbMaintenance.GetColumnInfosByTableName(cBTQName);
 
-                if(cols != null && cols.Count > 0)
+                if (cols != null && cols.Count > 0)
                 {
                     foreach (var col in cols.Where(col => !colList.ContainsKey(col.DbColumnName.ToLower())))
                     {
                         if (cCardPostion == "H" || cCardPostion == "L")
-                            colList.Add(col.DbColumnName.ToLower(),$"{cBTQName}.[{col.DbColumnName}]");
+                            colList.Add(col.DbColumnName.ToLower(), $"{cBTQName}.[{col.DbColumnName}]");
 
-                        colListHead.Add(col.DbColumnName.ToLower(),$"{cBTQName}.[{col.DbColumnName}]");
+                        colListHead.Add(col.DbColumnName.ToLower(), $"{cBTQName}.[{col.DbColumnName}]");
                     }
                 }
 
@@ -1192,7 +1357,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                             {
                                 vouchersIdFieldName = col.DbColumnName.ToLower();
                             }
-                            else 
+                            else
                             {
                                 if (cCardPostion == "B" || cCardPostion == "L")
                                     colList.Add(col.DbColumnName.ToLower(), $"{cBWTblExtName}.[{col.DbColumnName}]");
@@ -1218,14 +1383,14 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                 {
                     query.AddJoinInfo(cBWTblExtName, cBWTblExtName, $"{cBWQName}.[{vouchersIdFieldName}]={cBWTblExtName}.[{vouchersIdFieldName}]");
                 }
-                
+
                 if (input != null)
                 {
                     var conModels = new List<IConditionalModel>();
 
                     foreach (var o in input)
                     {
-                        if (o.Key == "dModifyDate")
+                        if (o.Key == "dModifyDate" && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             if (colListHead.Any(a => string.Equals(a.Key, "caudittime", StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, "caudittime", StringComparison.OrdinalIgnoreCase)))
                             {
@@ -1235,13 +1400,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                                 {
                                     FieldName = $"{col.Value}",
                                     ConditionalType = ConditionalType.GreaterThanOrEqual,
-                                    FieldValue = $"{o.Value}"
+                                    FieldValue = $"{o.Value}",
                                 });
-                            }
 
-                               
+                            }
                         }
-                        else if(o.Key == "dModifyDate__2")
+                        else if (o.Key == "dModifyDate__2" && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             if (colListHead.Any(a => string.Equals(a.Key, "caudittime", StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, "caudittime", StringComparison.OrdinalIgnoreCase)))
                             {
@@ -1281,7 +1445,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                                 });
                             }
                         }
-                        else if (o.Key.EndsWith("__2"))
+                        else if (o.Key.EndsWith("__2") && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             if (colListHead.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
                             {
@@ -1307,7 +1471,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                                 });
                             }
                         }
-                        else if (input.ContainsKey($"{o.Key}__2"))
+                        else if (input.ContainsKey($"{o.Key}__2") && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             if (colListHead.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
                             {
@@ -1333,7 +1497,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                                 });
                             }
                         }
-                        else if (colListHead.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
+                        else if (colListHead.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)) && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             var col = colListHead.First(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase));
 
@@ -1343,7 +1507,8 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                                 ConditionalType = ConditionalType.Equal,
                                 FieldValue = $"{o.Value}"
                             });
-                        }else if (colListBody.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
+                        }
+                        else if (colListBody.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)) && !string.IsNullOrWhiteSpace($"{o.Value}"))
                         {
                             var col = colListBody.First(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase));
 
@@ -1362,12 +1527,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                 query.Where(cDefWhere);
 
 
-                var selector =colList.Select(col => new SelectModel { FieldName = $"{col.Value}", AsName = col.Key }).ToList();
+                var selector = colList.Select(col => new SelectModel { FieldName = $"{col.Value}", AsName = col.Key }).ToList();
 
                 query.Select(selector).Distinct();
 
                 _logInfo.Debug(query.ToSqlString());
-                
+
                 return new BaseResult<dynamic>() { bSuccess = true, message = "查询成功", result = await query.ToListAsync() };
             }
             catch (Exception ex)

UFIDA.U8.Framework.Api/Controllers/U8/SAController.cs

@@ -4,16 +4,12 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web.Http;
-using System.Web.UI.WebControls;
 using UFIDA.U8.Framework.Api.Common.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Common;
 using UFIDA.U8.Framework.Api.ControlObject.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Json;
-using UFIDA.U8.Framework.Api.ControlObject.PU;
 using UFIDA.U8.Framework.Api.ControlObject.SA;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
 using UFIDA.U8.Framework.Api.Unit;
@@ -45,14 +41,26 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpPost]
         [Route("api/U8/SA/{cCardNum}/Save")]
-        public async Task<BaseResult<string>> Save(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, int VoucherState = 0, bool? bVerify = null)
+        public async Task<BaseResult<string>> Save(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, int VoucherState = 0, bool? bVerify = null, string tradeid = null)
         {
             try
             {
+                if (Request.Headers.TryGetValues("userToken", out var values))
+                {
+                    return await SaveToken(cCardNum, input, VoucherState, bVerify);
+                }
+
                 var db = CommUnit.GetDbClient();
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{cAccId},数据:{input.ToJson()}");
 
                 if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
@@ -143,16 +151,157 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
                     (VoucherTypeSA)Convert.ToInt32(voucherInfo.VoucherType), VoucherState, bGetCode, codeKey,
                     bVerify ?? voucherInfo.bVerify, voucherInfo.iswfcontrolled, voucherInfo.cFlowFieldName);
 
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
                 return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+                var res = new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
+        /// <summary>
+        /// 保存单据
+        /// </summary>
+        /// <param name="cCardNum">单据类型编码</param>
+        /// <param name="input">报文</param>
+        /// <param name="VoucherState">单据状态:0新增,1修改</param>
+        /// <param name="bVerify">是否审核</param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [Route("api/U8/SA/{cCardNum}/Save/Token")]
+        public async Task<BaseResult<string>> SaveToken(string cCardNum, [FromBody] Dictionary<string, object> input, int VoucherState = 0, bool? bVerify = null, string tradeid = null)
+        {
+            try
+            {
+                var db = CommUnit.GetDbClient();
+
+                var workId = SnowFlakeSingle.Instance.NextId();
+
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
+                var userToken = Request.Headers.GetValues("userToken").First();
+
+                _logInfo.Debug($"当前接口:api/U8/SA/{cCardNum}/Insert/{userToken},参数:{input.ToJson()}");
+
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
+
+                var token = CommUnit.GetDecrypt(output.userToken);
+
+                _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},数据:{input.ToJson()}");
+
+                var baseLogin = new BaseLogin();
+
+                baseLogin.Init(output, false);
+
+                _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
+
+                var voucherInfo = await db.Queryable<SysU8VoucherDefine>().FirstAsync(s => s.CardNumber == cCardNum);
+
+                var defs = await db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "H" && s.bEnable == true).ToListAsync();  //查询表头字段配置,供后续设置字段值
+
+
+                var newNumber = "";
+                var bGetCode = false;
+                var codeKey = "";
+
+                if (defs.Any(a => a.bDefault == true && a.cPosition == "H" && a.DefaultValue == "单号" && a.bEnable == true))
+                {
+                    bGetCode = true;
+                    codeKey = defs.Where(a => a.bDefault == true && a.cPosition == "H" && a.DefaultValue == "单号" && a.bEnable == true).Select(a => a.FieldName).First();
+
+                    _logInfo.Debug($"作业Id:{workId}-----配置获取单号");
+                }
+                else
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----没有单号需要自动指定");
+                }
+
+                #region 调整日期,去掉时间部分
+
+                if (input.ContainsKey("ddate"))
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----调整日期,去掉时间部分");
+                    input["ddate"] = $"{Convert.ToDateTime(input["ddate"]):yyyy-MM-dd}";
+                }
+
+                if (input.ContainsKey("dtvdate"))
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----调整日期,去掉时间部分");
+                    input["dtvdate"] = $"{Convert.ToDateTime(input["dtvdate"]):yyyy-MM-dd}";
+                }
+
+                #endregion
+                _logInfo.Debug($"作业Id:{workId}-----设置表头数据");
+                input.SetDictionaryData(defs, baseLogin.Connection, newNumber);
+
+                _logInfo.Debug($"作业Id:{workId}-----读取表体数据");
+                var bodyData = input[voucherInfo.BodyName].ToJson().ToList<Dictionary<string, object>>(); //读取表体的数据
+
+                if (bodyData == null || bodyData.Count <= 0)
+                    throw new Exception("无表体数据!");
+
+                _logInfo.Debug($"作业Id:{workId}-----获取表体字段配置");
+                var defsBody = await db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "B" && s.bEnable == true).ToListAsync();   //获取表体的字段配置
+
+                var rowNo = 1;
+
+                foreach (var body in bodyData)
+                {
+                    _logInfo.Debug($"作业Id:{workId}-----设置第{rowNo}行单据数据");
+                    body.SetDictionaryData(defsBody, baseLogin.Connection, newNumber, rowNo);
+
+                    rowNo++;
+                }
+
+                input[voucherInfo.BodyName] = bodyData;
+
+                var co = new ClsVoucherCO_SA();
+
+                var res = await co.Save(baseLogin, input, cCardNum,
+                    (VoucherTypeSA)Convert.ToInt32(voucherInfo.VoucherType), VoucherState, bGetCode, codeKey,
+                    bVerify ?? voucherInfo.bVerify, voucherInfo.iswfcontrolled, voucherInfo.cFlowFieldName);
+
+                baseLogin.ShutDown();
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
+            }
+            catch (Exception ex)
+            {
+                _logInfo.Error(ex.Message, ex);
+
+                var res = new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
+            }
+        }
+
+
         /// <summary>
         /// 查询特定单据部分
         /// </summary>

UFIDA.U8.Framework.Api/Controllers/U8/STController.cs

@@ -12,7 +12,6 @@ using UFIDA.U8.Framework.Api.ControlObject.Entity;
 using UFIDA.U8.Framework.Api.ControlObject.Json;
 using UFIDA.U8.Framework.Api.ControlObject.ST;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
-using UFIDA.U8.Framework.Api.Entity;
 using UFIDA.U8.Framework.Api.Models;
 using UFIDA.U8.Framework.Api.Unit;
 // ReSharper disable StringLiteralTypo
@@ -45,22 +44,31 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <param name="sAddedState">传空字符串</param>
         /// <param name="bReMote">是否远程</param>
         /// <param name="bVerify">是否生成时审核</param>
+        /// <param name="bVerify2"></param>
+        /// <param name="tradeid">请求ID</param>
         /// <returns></returns>
         [HttpPost]
         [Route("api/U8/ST/{cCardNum}/Insert")]
-        public async Task<BaseResult<string>> Insert(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bReMote = false, bool? bVerify = null, bool? bVerify2 = null)
+        public async Task<BaseResult<string>> Insert(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bReMote = false, bool? bVerify = null, bool? bVerify2 = null, string tradeid = null)
         {
             try
             {
                 if (Request.Headers.TryGetValues("userToken", out var values))
                 {
-                    return await InsertToken(cCardNum, input, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, bVerify);
+                    return await InsertToken(cCardNum, input, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, bVerify, bVerify2);
                 }
 
                 var db = CommUnit.GetDbClient();
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{cAccId},数据:{input.ToJson()}");
 
                 //LoginParamter param;
@@ -250,13 +258,23 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, bVerify ?? voucherInfo.bVerify, voucherInfo.bPrintDom, bVerify2 ?? false);
 
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
                 return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+                var res = new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -272,10 +290,11 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <param name="sAddedState">传空字符串</param>
         /// <param name="bReMote">是否远程</param>
         /// <param name="bVerify">是否生成时审核</param>
+        /// <param name="bVerify2"></param>
         /// <returns></returns>
         [HttpPost]
         [Route("api/U8/ST/{cCardNum}/Insert/Token")]
-        public async Task<BaseResult<string>> InsertToken(string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bReMote = false, bool? bVerify = null, bool? bVerify2 = null)
+        public async Task<BaseResult<string>> InsertToken(string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bReMote = false, bool? bVerify = null, bool? bVerify2 = null, string tradeid = null)
         {
             try
             {
@@ -283,7 +302,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 _logInfo.Debug($"当前接口:api/U8/ST/{cCardNum}/Insert/{userToken},参数:{input.ToJson()}");
 
-                var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
+                var output = CommUnit.GetDecrypt(userToken).ToObject<UserTokenInfo>();
 
                 var token = CommUnit.GetDecrypt(output.userToken);
 
@@ -291,28 +310,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},数据:{input.ToJson()}");
 
-                //LoginParamter param;
+                var baseLogin = new BaseLogin();
 
-
-
-                if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
-                {
-                    _logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
-
-                    baseLogin = new BaseLogin();
-
-                    baseLogin.Init(token, false, 5);
-
-                    _cache.Clear();
-
-                    _cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
-                }
-                //else
-                //{
-                //    param = await CommUnit.GetLoginParamter(cAccId);
-                //}
+                baseLogin.Init(output, false);
 
                 _logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
 
@@ -475,13 +484,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, bVerify ?? voucherInfo.bVerify, voucherInfo.bPrintDom, bVerify2 ?? false);
 
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                baseLogin.ShutDown();
+
                 return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+                var res = new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -719,7 +740,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/Verify/Code")]
-        public async Task<BaseResult<string>> Verify(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> Verify(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -727,6 +748,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:审核,对接账套:{cAccId},单号:{cCode}");
 
                 //LoginParamter param;
@@ -761,13 +789,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.Verify(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+                var res = await co.Verify(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -784,7 +824,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/Verify/ID")]
-        public async Task<BaseResult<string>> Verify(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> Verify(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -792,6 +832,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:审核,对接账套:{cAccId},ID:{voucherId}");
 
                 //LoginParamter param;
@@ -826,13 +873,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.Verify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+                var res = await co.Verify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "审核失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -953,7 +1012,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/UnVerify/Code")]
-        public async Task<BaseResult<string>> UnVerify(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> UnVerify(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -961,6 +1020,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{cAccId},单号:{cCode}");
 
                 //LoginParamter param;
@@ -995,13 +1061,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+                var res = await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -1019,7 +1097,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/UnVerify/ID")]
-        public async Task<BaseResult<string>> UnVerify(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> UnVerify(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -1027,6 +1105,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:弃审,对接账套:{cAccId},ID:{voucherId}");
 
                 //LoginParamter param;
@@ -1061,13 +1146,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+                var res = await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "弃审失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -1188,7 +1285,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/Delete/Code")]
-        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, string cCode, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -1196,6 +1293,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{cAccId},单号:{cCode}");
 
                 //LoginParamter param;
@@ -1230,13 +1334,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.Delete(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+                var res = await co.Delete(baseLogin, cCardNum, voucherInfo.VoucherType, cCode, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }
 
@@ -1254,7 +1370,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
         /// <exception cref="Exception"></exception>
         [HttpGet]
         [Route("api/U8/ST/{cCardNum}/Delete/ID")]
-        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false)
+        public async Task<BaseResult<string>> Delete(string cAccId, string cCardNum, long voucherId, bool bCheck = true, bool bBeforCheckStock = true, bool bList = false, string tradeid = null)
         {
             try
             {
@@ -1262,6 +1378,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var workId = SnowFlakeSingle.Instance.NextId();
 
+                if (string.IsNullOrWhiteSpace(tradeid))
+                {
+                    tradeid = $"{workId}";
+                }
+
+                await CommUnit.SaveResult(tradeid, true);
+
                 _logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:删除,对接账套:{cAccId},ID:{voucherId}");
 
                 //LoginParamter param;
@@ -1296,13 +1419,25 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
 
                 var co = new USERPCO();
 
-                return await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+                var res = await co.UnVerify(baseLogin, cCardNum, voucherInfo.VoucherType, voucherId, bCheck, bBeforCheckStock, bList);
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
             catch (Exception ex)
             {
                 _logInfo.Error(ex.Message, ex);
 
-                return new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+                var res = new BaseResult<string> { bSuccess = false, message = "删除失败", result = ex.Message };
+
+                res.tradeid = tradeid;
+
+                await CommUnit.SaveResult(tradeid, false, res);
+
+                return res;
             }
         }