From 2ac2564bd5b4261349835a63f0a6cf63d95997ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=95=8F=E5=81=A5=20=E9=82=B1?= Date: Tue, 18 Feb 2025 11:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/SysU8VoucherDefine.cs | 6 ++ .../ST/USERPCO.cs | 63 ++++++++++++++++-- UFIDA.U8.Framework.Api/App_Data/AP49.json | 45 ------------- UFIDA.U8.Framework.Api/App_Data/API_Meta.db | Bin 65536 -> 69632 bytes UFIDA.U8.Framework.Api/App_Data/FC90.json | 21 ------ UFIDA.U8.Framework.Api/App_Data/U8API.xml | 40 +++++------ .../App_Data/采购入库单模板.json | 32 +++++---- .../Controllers/U8/STController.cs | 2 +- .../UFIDA.U8.Framework.Api.csproj | 2 - 9 files changed, 100 insertions(+), 111 deletions(-) delete mode 100644 UFIDA.U8.Framework.Api/App_Data/AP49.json delete mode 100644 UFIDA.U8.Framework.Api/App_Data/FC90.json 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 8b049e1e7b3f85ceda646b616b26c6a7feaa2fbc..088808aaf72d476ac818a8212e74f6beaddeb1a6 100644 GIT binary patch delta 4060 zcmai1du$u^9l!J0cRu^>ez6_LP2DuFI*FSmy@&67UP}@?bqMPtG^K#HwZV^bo2Q|5 z1raKJEt=3^B>Z4((u68DsoFzmEE@=|j1>^i7PS(8GBH5FA8Z40I($Z-#xlIVsB^617QS@#H< z;#l5wDAyds1Pi&$k_3U%voikU^%(x!A>QNl?j4H1oSu#EuCm%Hi|QOykX z0z<4d#s*Bgl8P@MWw`#H5D|?LP737wJ2P`oq)BAtEe= zrIqE&nOEiyeXo9eW6i=IAPM~8wY%I9WbeYl?(q2fYRXR6=W=(}Pc=b(QgoGcAGnTu zJ&4a=_iftz;P`#Vax<0j%ItC1DSkse5rboe4vw z1aul_SF$qViHzo711cHK=Kwbgawfsr5D?CnJAp8h_S(HND}>t!Af^UVGHLoIC^w;) z`DOY&HVAaN3E89@qU;_lH>_`o;dGZ>2!I!gW_8lAM%u|(m2BbCgiQwk#K7N_y+x6V z66i1JM`#aXgg1maVNf9Xi~N)PLB5mwl6!%Bh|6+>|3&{1|90Os-z&b;zIOIicE9(s zciKxaPcj*1BmEhDmOeK*C{YLtqCSS`8&suXl84L*Oh zgBuWot18ocRO8gG!Bve}D0f;KlkElH6^$_xmd5n;1XnfYY$3t*ZE*m-xUNWZJG++y zm>M%)Npm|lJAkC6G08Z%+8Q%6)h)=w16?;|wltl9_04uV(%8nS9cz-6Gs##Dmoz-E zsfJ6+WZNBFYETEwl7`hbC*yWgXWCi;tkIcTnc3R{HZ?M1s!aVR&oy%%10~5w{}V0501mxkzB<% zzEu*%I0g}^pNiH5GQbg@QtXN&e&CzZEBV4IohGQ~;d>{=k5>b;T3sQxve zl2LsQFb>13ur_2hqQg{^0k7RJAY7W(xBo+en~BTD!PeTM#u?nehvGfE*A zodZF6Q@CZ5i`q?&?VCNiU%#__tZ>*kvco8i&lqFnsp6O{%BmegW-7PMl*)ddf16g?_@t#|b`;&ZD10m?+ebldLYV~o^Fnqj0$x}4W_!;lq4&J|NqQZ{5w5=*(FrYJe1lvmZ9UV`OHm9)HJ z7@AQi8u?TrpH!5BDyv38PwA>A7K?IHfmcCO3?*5VN}5zis)bxZRPv&j0y240&KH0; zuPAy+)^mDFQwv2Uk(6~=O38XDRm!IdseDnAa=Mr+NU6LGuqwhb7mS=?6mo`^OG$FE zq!x79NT_N;HZ-8BX&CI>k3%nJNiM^4%dOzM@xjO9sK)Y{`Ia`G+emomGQ~I1W#27) znfaNAr3Q(Yh?B%g1<{dPTk%ErI*i;6AwSHD*BqERif1A{J>9^EQ0NyAAiFa@|}T%S1*- z$cL3`9`@*a%+X)D5$eq|S4|At)NNkGm%ZB;Ptu=|i|=wDl8jj@K`ddi?goAqjn>Tx z-f9^C+Ax|Uj7I&RFxqmMD`XSzi}PNCV9D1A{yzV2-S;rR_rAx}d7mO*^F0AQ{tdaf zpZtXjU-Wb>-`{=xjmy6xw2f7>{)WUI?z1@J`IFmwk&qV_dhu73>SbfqWyG($_ri{w zECcN%={sE?Vj_}6p4o?A6yjt6e=NL-w(!1|mbU!uN5*F=JId3G_j+^gKU}6;$T`e> zIWsg@ZOF>!fF8E~hOvz|{bL|lkcp!4$)itx`slNto&V`4kGz(TtED15$rHHE)B)3X@+x5nYOjW&FI>CEHz zx;JnL_Im$B@1wWS^XQidqleHWx*KJYh|E3O4dFzHV~B7#>?MWa9C{o8 delta 696 zcmZ8dVMtR^6ux(Rdv5N%U1f7`bJeV2Za+5mHnq1vbdf=1EfgatLfxLEsiRCHQ1D?t z6Zbqs2o)0j@K?DWk{N=*Xv6$rME@cqkp2kHMMy;0oePTKoO{pt&N<)t?j4_H#>bhI zi*G{+RZ!PcXH@SoPa6uv#(0{UaVH{AEzh`jM94HT5@TA)TNqjs)TkBQ&C(x9mz!M-SwSu}Duiriy&ren z9`2M*^~nQ?lX7q0kSy7Cda;CFNRGs>$~Q`Qac!Ndc<6`d!x)q$tIJ%JVKVO;$X(*F zJh24%4sL_HX5Qu3(#o)z;j^e;ReH7EGaqoMhjv@7byakv_Buk5h(yhskbApF25$OV zXp)czlVT(k5F4dHLom<)htGyJ@tlmYNxL8G5AtLN>BxCKX(unqOj`Lt-?xZPt4gbd zEVgnSrS}*4MaWJ0?Ef+y7sZB9kZyLX(F3+t{%@-ZNkNestWQ-t>HWWk(&Xb*jaHNT zO!f~o)$)9ut-&gk<%h7UMqS2wsR{{B!3mRj!Mr*3A|6jB + + + 平台功能 + + 日志组件 @@ -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