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

2026-05-26 08:45:24 +08:00
parent 8208ba7488
commit 42e6579447
30 changed files with 2891 additions and 374 deletions
@@ -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>