diff --git a/UFIDA.U8.Framework.Api.Common/Entity/SysU8VoucherDefine.cs b/UFIDA.U8.Framework.Api.Common/Entity/SysU8VoucherDefine.cs index 3ab0f7a..b3cc992 100644 --- a/UFIDA.U8.Framework.Api.Common/Entity/SysU8VoucherDefine.cs +++ b/UFIDA.U8.Framework.Api.Common/Entity/SysU8VoucherDefine.cs @@ -43,5 +43,11 @@ namespace UFIDA.U8.Framework.Api.Common.Entity [SugarColumn(ColumnDescription = "是否自动审核")] public bool bVerify { get; set; } + /// + /// 是否输出DOM + /// + [SugarColumn(ColumnDescription = "是否输出DOM")] + public bool bPrintDom { get; set; } + } } diff --git a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs index 3afd372..a64a24b 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs @@ -24,13 +24,15 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST protected readonly ILog logInfo = LogManager.GetLogger("logInfo"); - public async Task> Insert(BaseLogin baseLogin, Dictionary dictionary,string cCardNum, string sVouchType,bool bGetCode=false,string codeKey="",bool bCheck=true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="", bool bReMote=false,bool bAudit=false) + public async Task> Insert(BaseLogin baseLogin, Dictionary dictionary,string cCardNum, string sVouchType,bool bGetCode=false,string codeKey="",bool bCheck=true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="", bool bReMote=false,bool bAudit=false,bool bPrintDom=false) { try { var co = "USERPCO.VoucherCO".GetComObject(); var errorMsg = ""; + logInfo.Debug("开始输出登录信息"); + logInfo.Debug(baseLogin._vbLogin.userToken); if (!co.IniLogin(baseLogin._vbLogin, ref errorMsg)) { @@ -43,10 +45,32 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST IXMLDOMDocument2 domPosition = new DOMDocument(); errorMsg = ""; - if (!co.GetDefaultVoucherDom(sVouchType, cCardNum, ref domHead, ref domBody, ref domPosition, ref errorMsg) || !string.IsNullOrWhiteSpace(errorMsg)) + + try { - throw new Exception(errorMsg); + logInfo.Debug("开始获取单据默认模板..."); + if (!co.GetDefaultVoucherDom(sVouchType, cCardNum, ref domHead, ref domBody, ref domPosition, + ref errorMsg) || !string.IsNullOrWhiteSpace(errorMsg)) + { + throw new Exception(errorMsg); + } } + catch (Exception ex) + { + logInfo.Error($"获取单据默认模板失败,错误信息:{ex.Message}", ex); + + errorMsg = ""; + + logInfo.Debug($"开始读取单据数据,当前单据编码:{cCardNum}"); + + if (!co.Load(sVouchType, "1=2", ref domHead, ref domBody, ref domPosition, ref errorMsg, true) || !string.IsNullOrWhiteSpace(errorMsg)) + { + throw new Exception(errorMsg); + } + + } + + logInfo.Debug("填充表头DOM..."); domHead = dictionary.ToDocument2(domHead); @@ -75,18 +99,45 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST } } - + logInfo.Debug("填充表体DOM..."); domBody = dictionarys.ToDocument2(domBody); IXMLDOMDocument2 domMsg = new DOMDocument(); errorMsg = ""; baseLogin.Connection.BeginTrans(); - var vouchId = ""; + object vouchId = ""; var res = new BaseResult(); try { + if (bPrintDom) + { + logInfo.Debug("开始输入DOM..."); + + logInfo.Debug(domHead.xml); + + logInfo.Debug(domBody.xml); + } + + 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, domPosition, ref errorMsg, baseLogin.Connection, ref vouchId, ref domMsg, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); + + if (res.bSuccess) + { + logInfo.Debug($"操作完成,操作结果:成功!------[{vouchId}]------[{errorMsg}]------[{domMsg.xml}]"); + } + else + { + logInfo.Debug($"操作完成,操作结果:失败!------[{vouchId}]------[{errorMsg}]------[{domMsg.xml}]"); + } + } catch (Exception) { @@ -166,7 +217,7 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST } res.message = "新增成功"; - res.result = vouchId; + res.result =$"{vouchId}" ; return res; diff --git a/UFIDA.U8.Framework.Api/App_Data/AP49.json b/UFIDA.U8.Framework.Api/App_Data/AP49.json deleted file mode 100644 index 7a8fe0b..0000000 --- a/UFIDA.U8.Framework.Api/App_Data/AP49.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "cVouchType": "49", - "cVouchID": "0000000030", - "dVouchDate": "2015-07-22 00:00:00.000", - "cDwCode": "01004", - "cSSCode": "1", - "cDeptCode": "0401", - "cSSName": "现金", - "iPeriod": 7, - "cPerson": "00043", - "cPersonName": "顾潇", - "cexch_name": "人民币", - "iExchRate": 1, - "iAmount_f": 100.00, - "iAmount": 100.00, - "iRAmount_f": 100.00, - "iRAmount": 100.00, - "cTypeName": "付款单", - "cFlag": "AP", - "iPayForOther": 0, - "bFromBank": 0, - "bToBank": 0, - "bSure": 0, - "cCode": "1001", - "bStartFlag": 0, - "body": [ - { - "bPrePay": 0, - "iType": 0, - "cType": "应付款", - "iAmt_f": 100, - "iAmt": 100, - "cKm": "220202", - "cDepName": "采购部", - "cPersonName": "顾潇", - "iRAmt_f": 100.00, - "iRAmt": 100.00, - "cCusVen": "01004", - "iAmt_s": 0, - "iRAmt_s": 0, - "cDepCode": "0401", - "cPersonCode": "00043" - } - ] -} \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api/App_Data/API_Meta.db b/UFIDA.U8.Framework.Api/App_Data/API_Meta.db index 8b049e1..088808a 100644 Binary files a/UFIDA.U8.Framework.Api/App_Data/API_Meta.db and b/UFIDA.U8.Framework.Api/App_Data/API_Meta.db differ diff --git a/UFIDA.U8.Framework.Api/App_Data/FC90.json b/UFIDA.U8.Framework.Api/App_Data/FC90.json deleted file mode 100644 index e38f63b..0000000 --- a/UFIDA.U8.Framework.Api/App_Data/FC90.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cVouchDate": "2024-06-30", - "wcid": null, - "body": [ - { - "moid": 1000000074, - "modid": 1000000092, - "mocode": null, - "moseq": 1, - "opseq": "0010", - "inopseq": "0020", - "employcode": "00006", - "actualduedate": "2024-06-30 00:00:00", - "moroutingid": 1000000010, - "outmoroutingdid": 1000000026, - "moroutingdid": 1000000027, - "opstatus": 3, - "qualifiedqty": 1 - } - ] -} diff --git a/UFIDA.U8.Framework.Api/App_Data/U8API.xml b/UFIDA.U8.Framework.Api/App_Data/U8API.xml index e8015c6..f68664c 100644 --- a/UFIDA.U8.Framework.Api/App_Data/U8API.xml +++ b/UFIDA.U8.Framework.Api/App_Data/U8API.xml @@ -637,6 +637,11 @@ + + + 平台功能 + + 日志组件 @@ -845,6 +850,11 @@ 报文数据 + + + 库存管理 + + 日志组件 @@ -854,28 +864,14 @@ 新增单据 - - - - - - - - - - - - - 更新单据 - - - - - - - - - + 系统号 + 单据类型编码 + 报文 + 是否控制可用量 + 是否检查可用量 + 是否红字单据 + 传空字符串 + 是否远程 diff --git a/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json b/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json index 45f16f3..eafc6f8 100644 --- a/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json +++ b/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json @@ -1,15 +1,19 @@ -{ - "ccode": "", //单号 - "ddate": "2022-10-25", //入库日期,日期格式无时间部分 - "cwhcode": "04", //仓库编码 - "cexch_name": "人民币", - "cmaker": "demo", //制单人 - "cmemo": "", //备注 - "body": [ - { - "cinvcode": "F010-80102251", //存货编码 - "iquantity": 10, //数量 - "dmadedate": "2022-10-10", //生产日期,日期格式无时间部分,没有启动保质期管理可以不用录入 - } - ] +{ + + "ddate": "2022-10-25", + "cwhcode": "04", + "cexch_name": "人民币", + "bredvouch": 0, + "brdflag": 1, + "bincost": true, + "cdepcode": "0407", + "cbustype": "普通采购", + "cmaker": "demo", + "cmemo": "", + "body": [ + { + "cinvcode": "F010-80102251", + "iquantity": 10 + } + ] } \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs index bcd96c5..225457c 100644 --- a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs +++ b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs @@ -240,7 +240,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 var co = new USERPCO(); - var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, voucherInfo.bVerify); + var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, voucherInfo.bVerify,voucherInfo.bPrintDom); return res; } diff --git a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj index 55d9ec7..42cd9d5 100644 --- a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj +++ b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj @@ -428,8 +428,6 @@ - - PreserveNewest