From 7e8fbf96c0e985791b7aad451b1b33d933ba77df Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 29 七月 2024 16:56:11 +0800
Subject: [PATCH] 库存检验单 增加 批次号,检验数量,良品数量,报废数量,可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(18,8) --检验数量 HRightQty dec(18,8) --合格数量 HUnRightQty dec(18,8) --不合格数量 HUnKnowQty dec(18,8) --可疑数量 实验室 仪器检验时,扫码流转卡二维码的, 改为 可以扫 取样单 二维码(即 可以扫流转卡也可以扫取样单)。 检验单里 保存 对应的 取样单 内码; 首件单,巡检单,工序检验单 表头增加 字段 HTakeSampleCheckBillID int --取样单内码 HTakeSampleCheckBillNo int --取样单 出站单 :增加 字段: 返工数,工废数量,料废数量 ,料废返工数量 HBackWorkQty dec(18,8) -- 返工数 HBadByWorkQty dec(18,8) -- 工废数量 HBadByMaterQty dec(18,8) --料废数量 HBackWorkByMaterQty dec(18,8) --料废返工数量

---
 WebAPI/InvokeHelper.cs |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 59d764c..ae7824f 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -4,28 +4,36 @@
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using WebAPI.Utility;
 
 namespace WebAPI
 {
     public static class InvokeHelper
     {
-        //private static string CloudUrl = "http://localhost/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
-        //private static string CloudUrl = "http://60.190.4.42:9002/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
-        //private static string CloudUrl = "http://47.96.97.237/k3cloud/";//K/3 Cloud 涓氬姟绔欑偣鍦板潃
-        private static string CloudUrl = "http://60.190.4.42:9002/K3CLOUD/";//澶忓疂
-
+        private static string CloudUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
         /// <summary>
         /// 鐧婚檰
         /// </summary>
         public static string Login()
         {
+            //浠嶤鐩橀厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+            Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
+            var useName = Pub_Class.ClsPub.sCLOUDUseName;
+            var pwd = Pub_Class.ClsPub.sCLOUDPsd;
+            var dbId = Pub_Class.ClsPub.sCLOUDAcc;
+            CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;
+
+            //鍘熶粠Config/kdapi.config妯″潡涓幏鍙�    20240712灞忚斀
+            //var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+            //var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+            //var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
             HttpClient httpClient = new HttpClient();
             httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
 
             List<object> Parameters = new List<object>();
-            Parameters.Add("61b14ea86f5c8a");//璐﹀鏍囩ず
-            Parameters.Add("Administrator");//鐢ㄦ埛鍚�
-            Parameters.Add("888888");//瀵嗙爜
+            Parameters.Add(dbId);//璐﹀鏍囩ず
+            Parameters.Add(useName);//鐢ㄦ埛鍚�
+            Parameters.Add(pwd);//瀵嗙爜
             Parameters.Add(2052);//2052浠h〃涓枃
             httpClient.Content = JsonConvert.SerializeObject(Parameters);
 
@@ -37,9 +45,9 @@
             HttpClient httpClient = new HttpClient();
             httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
             List<object> Parameters = new List<object>();
-            Parameters.Add("5f9258a311401c");//璐﹀鏍囩ず
+            Parameters.Add("622703e117d642");//璐﹀鏍囩ず
             Parameters.Add("Administrator");//鐢ㄦ埛鍚�
-            Parameters.Add("qaz!@#123");//瀵嗙爜
+            Parameters.Add("sa@123456");//瀵嗙爜
             Parameters.Add(2052);//2052浠h〃涓枃
             httpClient.Content = JsonConvert.SerializeObject(Parameters);
 
@@ -215,6 +223,9 @@
             return httpClient.SyncRequest();
         }
 
+        /// <summary>
+        /// 鍗曟嵁鏌ヨ
+        /// </summary>
         public static string Query(string formId, string content)
         {
             HttpClient httpClient = new HttpClient();
@@ -246,6 +257,7 @@
         //鐢熶骇璁㈠崟 鎵ц
         public static string ExcuteOperation(string formId, string opNumber, string content)
         {
+            LogService.Write("鐢熶骇璁㈠崟 鎵ц锛宱pNumber锛� " + opNumber + ",content:" + content);
             HttpClient httpClient = new HttpClient();
             httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExcuteOperation.common.kdsvc");
 

--
Gitblit v1.9.1