From 3a6e2e1311d50e6b5d3fa5cf6ece870f1b69f819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E6=95=8F=E5=81=A5?= Date: Sun, 15 Dec 2024 15:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ST/USERPCO.cs | 19 +++++++++++++++---- .../Controllers/U8/STController.cs | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs index 133a238..50926fd 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs @@ -3,6 +3,7 @@ using MSXML2; using System; using System.Collections.Generic; using System.Threading.Tasks; +using System.Web; using UFIDA.U8.Framework.Api.ControlObject.Common; using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFIDA.U8.Framework.Api.ControlObject.Json; @@ -18,7 +19,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,string codeKey="",bool bCheck=true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="", bool bReMote=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) { try { @@ -32,7 +33,17 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST throw new Exception(errorMsg); } - var domHead = dictionary.ToDocument2(); + IXMLDOMDocument2 domHead = new DOMDocument(); + IXMLDOMDocument2 domBody = new DOMDocument(); + IXMLDOMDocument2 domPosition = new DOMDocument(); + + errorMsg = ""; + if (!co.GetDefaultVoucherDom(sVouchType, cCardNum, ref domHead, ref domBody, ref domPosition, ref errorMsg)) + { + throw new Exception(errorMsg); + } + + domHead = dictionary.ToDocument2(domHead); if (!dictionary.TryGetValue("body", out var bodys)) { @@ -60,8 +71,8 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST } - var domBody = dictionarys.ToDocument2(); - IXMLDOMDocument2 domPosition = new DOMDocument(); + domBody = dictionarys.ToDocument2(domBody); + IXMLDOMDocument2 domMsg = new DOMDocument(); errorMsg = ""; baseLogin.Connection.BeginTrans(); diff --git a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs index 5a5f629..7412638 100644 --- a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs +++ b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs @@ -237,7 +237,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 var co = new USERPCO(); - var res = await co.Insert(baseLogin, input, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); + var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); return res; }