提交测试

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; }
 
+        /// <summary>
+        /// 是否输出DOM
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否输出DOM")]
+        public bool bPrintDom { get; set; }
+
     }
 }

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<BaseResult<string>> Insert(BaseLogin baseLogin, Dictionary<string, object> 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<BaseResult<string>> Insert(BaseLogin baseLogin, Dictionary<string, object> 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<string>();
                 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;

UFIDA.U8.Framework.Api/App_Data/AP49.json

@@ -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"
-    }
-  ]
-}

UFIDA.U8.Framework.Api/App_Data/FC90.json

@@ -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
-    }
-  ]
-}

UFIDA.U8.Framework.Api/App_Data/U8API.xml

@@ -637,6 +637,11 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="T:UFIDA.U8.Framework.Api.Controllers.U8.DPController">
+            <summary>
+            平台功能
+            </summary>
+        </member>
         <member name="F:UFIDA.U8.Framework.Api.Controllers.U8.DPController.logInfo">
             <summary>
             日志组件
@@ -845,6 +850,11 @@
             <param name="input">报文数据</param>
             <returns></returns>
         </member>
+        <member name="T:UFIDA.U8.Framework.Api.Controllers.U8.STController">
+            <summary>
+            库存管理
+            </summary>
+        </member>
         <member name="F:UFIDA.U8.Framework.Api.Controllers.U8.STController.logInfo">
             <summary>
             日志组件
@@ -854,28 +864,14 @@
             <summary>
             新增单据
             </summary>
-            <param name="cAccId"></param>
+            <param name="cAccId">系统号</param>
-            <param name="cCardNum"></param>
+            <param name="cCardNum">单据类型编码</param>
-            <param name="input"></param>
+            <param name="input">报文</param>
-            <param name="bCheck"></param>
+            <param name="bCheck">是否控制可用量</param>
-            <param name="bBeforCheckStock"></param>
+            <param name="bBeforCheckStock">是否检查可用量</param>
-            <param name="bIsRedVouch"></param>
+            <param name="bIsRedVouch">是否红字单据</param>
-            <param name="sAddedState"></param>
+            <param name="sAddedState">传空字符串</param>
-            <param name="bReMote"></param>
+            <param name="bReMote">是否远程</param>
-            <returns></returns>
-        </member>
-        <member name="M:UFIDA.U8.Framework.Api.Controllers.U8.STController.Update(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean)">
-            <summary>
-            更新单据
-            </summary>
-            <param name="cAccId"></param>
-            <param name="cCardNum"></param>
-            <param name="input"></param>
-            <param name="bCheck"></param>
-            <param name="bBeforCheckStock"></param>
-            <param name="bIsRedVouch"></param>
-            <param name="sAddedState"></param>
-            <param name="bUpdateNeedEas"></param>
             <returns></returns>
         </member>
         <member name="M:UFIDA.U8.Framework.Api.WebApiApplication.CurrentDomain_AssemblyResolve(System.Object,System.ResolveEventArgs)">

UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json

@@ -1,15 +1,19 @@
-{
+{ 
-    "ccode": "", //单号
+
-    "ddate": "2022-10-25", //入库日期,日期格式无时间部分
+  "ddate": "2022-10-25", 
-    "cwhcode": "04", //仓库编码
+  "cwhcode": "04",
-    "cexch_name": "人民币",
+  "cexch_name": "人民币",
-    "cmaker": "demo", //制单人
+  "bredvouch": 0,
-    "cmemo": "", //备注
+  "brdflag": 1,
-    "body": [
+  "bincost": true,
-        {
+  "cdepcode": "0407",
-            "cinvcode": "F010-80102251", //存货编码
+  "cbustype": "普通采购",
-            "iquantity": 10, //数量
+  "cmaker": "demo",
-            "dmadedate": "2022-10-10", //生产日期,日期格式无时间部分,没有启动保质期管理可以不用录入
+  "cmemo": "",
-        }
+  "body": [
-    ]
+    {
+      "cinvcode": "F010-80102251", 
+      "iquantity": 10
+    }
+  ]
 }

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;
             }

UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj

@@ -428,8 +428,6 @@
     <Compile Include="Unit\RemoteLoader.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App_Data\AP49.json" />
-    <None Include="App_Data\FC90.json" />
     <Content Include="App_Data\U8API.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>