From 5d095e15ca7104629ab307dcba0d291e59a0f05a Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期三, 18 一月 2023 18:21:33 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 4fce0da..5418030 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -149,7 +149,7 @@
{
try
{
-
+ List<object> columnNameList = new List<object>();
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("exec h_p_Sc_ProcExchBilltransRelationQty " + HProcExchHinteID + "", "h_p_Sc_ProcExchBilltransRelationQty");
//鍐欏叆淇℃伅
@@ -161,10 +161,20 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
@@ -202,7 +212,8 @@
return objJsonResult;
}
- List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
+ List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
+ DBUtility.ClsPub.CurUserName = user;
long HMainInterID = 0;
HMainInterID = list[0].HMainInterID;
string eventType = list[0].eventType;
@@ -233,7 +244,7 @@
double HMoney = list[0].HMoney;//閲戦
string HRemark = list[0].HRemark;//澶囨敞
double HTaxRate = list[0].HTaxRate;//绋庣巼
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
int HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜
int HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧
@@ -263,7 +274,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HProcNo <= 0)
+ if (HProcNo == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -365,6 +376,7 @@
",HTaxRate=" + HTaxRate +
",HMaterID=" + HMaterID +
",HProcID=" + HProcID +
+ ",HEmpID=" + HEmpID +
",HProcNo=" + HProcNo +
",HOrderProcNO='" + HOrderProcNO + "'" +
" where HInterID=" + HInterID);
@@ -423,7 +435,7 @@
}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.Message = "鎿嶄綔鍗曟嵁鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
--
Gitblit v1.9.1