Open/U8API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复受流程控制不受控制的问题(益邦)

Browse Source
This commit is contained in:
qmj
2025-05-08 22:39:36 +08:00
parent 46c20e2895
commit 9e01715ea2
8 changed files with 210 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UFIDA.U8.Framework.Api.ControlObject/PU/clsVoucherCO_PU.cs
+53 -18
View File
@@ -1,8 +1,10 @@
using ADODB;
using log4net;
using Microsoft.VisualBasic;
using MSXML2;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection.Emit;
using System.Text;
@@ -61,8 +63,10 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
/// <param name="codeKey"></param>
/// <param name="bAudit"></param>
/// <param name="bPrintDom"></param>
/// <param name="iswfcontrolled"></param>
/// <param name="cFlowFieldName"></param>
/// <returns></returns>
public async Task<BaseResult<string>> VoucherSave(BaseLogin baseLogin, Dictionary<string, object> dictionary, string cardNumber, vouchertype enmVoucherType, bool bPositive = true, string sBillType = null, string sBusType = null, int VoucherState = 2, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, bool bGetCode = false, string codeKey = null, bool bAudit = false, bool bPrintDom = false)
public async Task<BaseResult<string>> VoucherSave(BaseLogin baseLogin, Dictionary<string, object> dictionary, string cardNumber, vouchertype enmVoucherType, bool bPositive = true, string sBillType = null, string sBusType = null, int VoucherState = 2, UseMode UserMode = UseMode.CS, string sOverDetailsXml = null, bool bGetCode = false, string codeKey = null, bool bAudit = false, bool bPrintDom = false,bool iswfcontrolled=false,string cFlowFieldName= "IsWfControlled")
{
try
{
@@ -129,9 +133,8 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
IXMLDOMDocument2 domMsg = new DOMDocument();
IXMLDOMDocument2 curDom = new DOMDocument();
co.bOutTrans = true;
baseLogin.Connection.BeginTrans();
logInfo.Debug($"{baseLogin.Connection.State},{baseLogin.Connection.ConnectionString}");
@@ -140,11 +143,24 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
var res = new BaseResult<string>();
if (bAudit)
{
logInfo.Debug("开始事务...");
co.bOutTrans = true;
baseLogin.Connection.BeginTrans();
}
try
{
logInfo.Debug("开始保存...");
errorMsg = co.VoucherSave(ref domHead, ref domBody, VoucherState, ref vouchId, ref curDom, UserMode, sOverDetailsXml, ref domMsg);
errorMsg = bAudit
? (string)co.VoucherSave2(ref domHead, ref domBody, VoucherState, ref vouchId, sOverDetailsXml, ref domMsg)
: (string)co.VoucherSave(ref domHead, ref domBody, VoucherState, ref vouchId, ref curDom, UserMode, sOverDetailsXml, ref domMsg);
logInfo.Debug("保存结束...");
logInfo.Debug(errorMsg);
logInfo.Debug($"{vouchId}");
@@ -153,15 +169,6 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
if (!res.bSuccess)
{
try
{
baseLogin.Connection.RollbackTrans();
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
}
if (!string.IsNullOrWhiteSpace(errorMsg))
{
throw new Exception(errorMsg);
@@ -177,8 +184,20 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
throw new Exception(curDom.xml);
}
throw new Exception("未知错误");
}
if (iswfcontrolled == false && VoucherState == 2)
{
var strSql = $"UPDATE {vouchers.cBTTblName} SET {cFlowFieldName} = 0 WHERE {vouchers.voucherIdFieldName}={vouchId}";
object rsts = new Recordset();
baseLogin.Connection.Execute(strSql,out rsts);
}
res.voucherCode = CommonHelper.GetVoucherCode(baseLogin.Connection, vouchId, vouchers);
res.voucherId = $"{vouchId}";
res.result = errorMsg;
@@ -186,7 +205,16 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
}
catch (Exception)
{
baseLogin.Connection.RollbackTrans();
try
{
if (bAudit)
baseLogin.Connection.RollbackTrans();
}
catch(Exception ex)
{
Trace.WriteLine(ex.Message);
}
throw;
}
@@ -194,7 +222,8 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
if (!res.bSuccess)
{
res.message = "保存失败";
baseLogin.Connection.RollbackTrans();
if (bAudit)
baseLogin.Connection.RollbackTrans();
return res;
}
@@ -225,9 +254,15 @@ namespace UFIDA.U8.Framework.Api.ControlObject.PU
}
}
logInfo.Debug("提交事务...");
baseLogin.Connection.CommitTrans();
if (bAudit)
{
logInfo.Debug("提交事务...");
baseLogin.Connection.CommitTrans();
}
return res;
UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs
+42 -93
View File
@@ -122,6 +122,9 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST
IXMLDOMDocument2 domMsg = new DOMDocument();
errorMsg = "";
var vouchers = CommonHelper.GetVouchers(baseLogin.Connection, cCardNum);
baseLogin.Connection.BeginTrans();
object vouchId = "";
@@ -140,125 +143,71 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST
}
logInfo.Debug("执行插入操作...");
//var cmd = new Command
//{
// CommandText = "Select '开始执行插入操作'",
// ActiveConnection = baseLogin.Connection
//};
//object rsts = new Recordset();
//cmd.Execute(out rsts);
res.bSuccess = co.Insert(sVouchType, domHead, domBody, null, ref errorMsg, baseLogin.Connection, ref vouchId, ref domMsg, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote);
if (res.bSuccess)
{
res.voucherId = $"{vouchId}";
logInfo.Debug($"操作完成,操作结果:成功!------[{vouchId}]------[{errorMsg}]------[{domMsg.xml}]");
res.voucherCode = CommonHelper.GetVoucherCode(baseLogin.Connection, vouchId, vouchers);
if (bAudit)
{
var res2 = co.Verify(sVouchType, vouchId, ref errorMsg, baseLogin.Connection, null, ref domMsg);
if (!res2)
{
baseLogin.Connection.RollbackTrans();
if (!string.IsNullOrWhiteSpace(errorMsg))
throw new Exception(errorMsg);
if (!string.IsNullOrWhiteSpace(domMsg.xml))
throw new Exception(domMsg.xml);
throw new Exception("审核单据时发生异常,请检查数据");
}
baseLogin.Connection.CommitTrans();
res.message = "新增成功";
}
res.message = "新增成功";
}
else
{
logInfo.Debug($"操作完成,操作结果:失败!------[{vouchId}]------[{errorMsg}]------[{domMsg.xml}]");
baseLogin.Connection.RollbackTrans();
if (!string.IsNullOrWhiteSpace(errorMsg))
throw new Exception(errorMsg);
if (!string.IsNullOrWhiteSpace(domMsg.xml))
throw new Exception(domMsg.xml);
throw new Exception("新增单据时发生异常,请检查数据");
}
}
catch (Exception)
{
baseLogin.Connection.RollbackTrans();
await Task.Delay(1);
throw;
}
res.message = errorMsg;
if (res.bSuccess && bAudit)
{
errorMsg = "";
try
{
if (!co.Verify(sVouchType, vouchId, ref errorMsg, baseLogin.Connection, null, ref domMsg))
{
baseLogin.Connection.RollbackTrans();
if (!string.IsNullOrWhiteSpace(errorMsg))
throw new Exception(errorMsg);
throw new Exception("审核单据时发生异常,请检查数据");
}
}
catch (Exception)
{
baseLogin.Connection.RollbackTrans();
res.bSuccess = false;
throw;
}
}
if (!res.bSuccess)
{
baseLogin.Connection.RollbackTrans();
if (!string.IsNullOrWhiteSpace(errorMsg))
throw new Exception(errorMsg);
throw new Exception(domMsg.xml);
}
baseLogin.Connection.CommitTrans();
var rst = new Recordset();
rst.Open($"SELECT CardNumber,BTTblName,BTQName,BWTblName,BWQName,VchListQName,VchTblPrimarykeyNames,ReceiptNOFieldName FROM dbo.vouchers WITH(NOLOCK) WHERE CardNumber='{cCardNum}'", baseLogin.Connection);
if (rst.BOF || rst.EOF)
{
res.bSuccess = false;
res.result = $"已在U8生成单据ID为{vouchId}的单据,但是未能查询到该单据的配置信息!";
}
else
{
rst.MoveFirst();
var fieldName = $"{rst.Fields["c"].Value}";
var codeName = $"{rst.Fields["ReceiptNOFieldName"].Value}";
if (string.IsNullOrWhiteSpace(fieldName) || string.IsNullOrWhiteSpace(codeName))
{
res.voucherCode = $"{res.voucherId}";
}
else
{
if (codeName.Contains("{##}"))
{
codeName = codeName.Split('{', '#', '#', '}')[0];
}
var strSql = $"SELECT {codeName} AS cCode FROM {rst.Fields["BTTblName"].Value} WITH(NOLOCK) WHERE {fieldName}='{vouchId}'";
rst.Close();
rst.Open(strSql, baseLogin.Connection);
if (rst.EOF || rst.BOF)
{
res.voucherCode = "";
}
else
{
rst.MoveFirst();
res.voucherCode = $"{rst.Fields["cCode"].Value}";
}
}
}
res.message = "新增成功";
res.result = $"{vouchId}";
return res;
//var bodys = dictionary.TryGetValue() dictionary["body"];
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
await Task.Delay(1);
return new BaseResult<string> { bSuccess = false, message = "新增失败", result = ex.Message };
}