diff --git a/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj b/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj index db6ee31..7c4e554 100644 --- a/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj +++ b/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj @@ -42,8 +42,8 @@ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\SqlSugar.5.1.4.170\lib\SqlSugar.dll + + ..\packages\SqlSugar.5.1.4.171\lib\SqlSugar.dll diff --git a/UFIDA.U8.Framework.Api.Common/packages.config b/UFIDA.U8.Framework.Api.Common/packages.config index 21de1d6..421f1e0 100644 --- a/UFIDA.U8.Framework.Api.Common/packages.config +++ b/UFIDA.U8.Framework.Api.Common/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs b/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs index bbe2651..f43d21d 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs @@ -8,6 +8,7 @@ using System.Text; using System.Web.UI.WebControls; using ADODB; using GetComObj; +using log4net; using MSXML2; using Newtonsoft.Json.Linq; using UFIDA.U8.Framework.Api.Common.Entity; @@ -18,6 +19,10 @@ namespace UFIDA.U8.Framework.Api.ControlObject.Common { public static class CommonHelper { + /// + /// 日志组件 + /// + private static readonly ILog logInfo = LogManager.GetLogger("logInfo"); public static void SetPropValue(this PropertyInfo prop, object obj, object value) { @@ -281,6 +286,23 @@ namespace UFIDA.U8.Framework.Api.ControlObject.Common return root; } + public static object SetDomKeyValue(this IXMLDOMDocument2 domDocument2,string key,object value) + { + var node= domDocument2.selectSingleNode("//z:row"); + + if (node == null) + return null; + + var attr = domDocument2.createAttribute(key); + + attr.nodeValue=value; + + node.attributes.setNamedItem(attr); + + + return value; + } + public static void ResetDictionary(this Dictionary dictionary, string bodyKey = "body") { if (dictionary.ContainsKey(bodyKey)) diff --git a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs index 25e34f5..1cd9fe3 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs @@ -18,7 +18,7 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST protected readonly ILog logInfo = LogManager.GetLogger("logInfo"); - public async Task> Insert(BaseLogin baseLogin, Dictionary dictionary,string sVouchType,bool bGetCode=false,bool bCheck=true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="", bool bReMote=false) + public async Task> Insert(BaseLogin baseLogin, Dictionary dictionary,string sVouchType,bool bGetCode=false,string codeKey="",bool bCheck=true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="", bool bReMote=false) { try { @@ -46,6 +46,18 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST throw new Exception("无法获取表体数据"); } + if (bGetCode && !string.IsNullOrWhiteSpace(codeKey)) + { + errorMsg = ""; + var newCode = co.GetNewVouchCode(sVouchType, domHead, ref errorMsg); + + logInfo.Debug($"获取新单号:{newCode}"); + //if (!string.IsNullOrWhiteSpace(newCode)) + //{ + // object value = domHead.SetDomKeyValue(codeKey, newCode); + //} + } + var domBody = dictionarys.ToDocument2(); IXMLDOMDocument2 domPosition = new DOMDocument(); @@ -57,7 +69,7 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST var res = new BaseResult(); try { - res.bSuccess = co.Update(sVouchType, domHead, domBody, domPosition, ref errorMsg, baseLogin.Connection, ref vouchId, ref domMsg, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); + res.bSuccess = co.Insert(sVouchType, domHead, domBody, domPosition, ref errorMsg, baseLogin.Connection, ref vouchId, ref domMsg, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); } catch (Exception ex) { diff --git a/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj b/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj index 6c0418c..4dd1dc6 100644 --- a/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj +++ b/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj @@ -1,5 +1,5 @@  - + @@ -68,10 +68,10 @@ ..\packages\Microsoft.TestPlatform.ObjectModel.17.12.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ..\packages\MSTest.TestFramework.3.6.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.3.6.4\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.3.6.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.3.6.4\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -191,11 +191,11 @@ - - + + - +