From 7314aa8ffbe86ecc8af1a2c5f00407ab9b5a8916 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 八月 2023 10:25:56 +0800
Subject: [PATCH] 询价单，报价单，excel生成送货单添加字段
---
WebAPI/Controllers/POOrderController.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/POOrderController.cs b/WebAPI/Controllers/POOrderController.cs
index b9cacbd..4778e3a 100644
--- a/WebAPI/Controllers/POOrderController.cs
+++ b/WebAPI/Controllers/POOrderController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
@@ -54,16 +55,24 @@
//Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
//鑾峰彇杩斿洖鏁版嵁
//sql = "exec H_P_REALESEPOORDER";
- sql = "exec H_P_REALESEPOORDER";
- oCn.RunProc(sql);
+ //sql = "exec H_P_REALESEPOORDER";
+ //oCn.RunProc(sql);
sql = "exec H_p_SRM_POOrderBillList '" + PcWhere + "'";
//LogService.WriteAsync(sql);
ds = oCn.RunProcReturn("exec H_p_SRM_POOrderBillList '" + PcWhere + "'", "H_p_SRM_POOrderBillList");
-
+ //娣诲姞鍒楀悕
+ List<object> columnNameList = new List<object>();
+ 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鍒楀璞＄殑鍒楀悕
+ }
objjson.code = "0";
objjson.count = 10000;
objjson.Message = "鑾峰彇鎴愬姛";
objjson.data = ds.Tables[0];
+ objjson.list = columnNameList;
return objjson;
}
@@ -179,17 +188,25 @@
}
}
[Route("POOrderAccept")]
- [HttpGet]
+ [HttpPost]
/// <summary>
/// 璁㈠崟鎺ュ彈
/// </summary>
/// <param name="HInterID"></param>
/// <returns></returns>
- public object POOrderAccept(string HInterID, string HBillNo, string HUser)
+ public object POOrderAccept([FromBody] JObject oData)
{
+ var _value = oData["oData"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string HInter = sArray[0].ToString();
+ string HInterID = HInter.Replace("\"", ""); //鍐呯爜
+ string HBillNo = sArray[1].ToString().Replace("\"", "");
+ string HUser = sArray[2].ToString(); //鐢ㄦ埛鍚�
+
try
{
- if (DBUtility.ClsPub.isLong(HInterID) == 0)
+ if (DBUtility.ClsPub.isStrNull(HInterID) == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -197,6 +214,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
DAL.ClsCg_POOrderBill oBill = new DAL.ClsCg_POOrderBill();
oBill.WebAccept(DBUtility.ClsPub.isLong(HInterID), DBUtility.ClsPub.isStrNull(HBillNo), DBUtility.ClsPub.isStrNull(HUser), ref DBUtility.ClsPub.sExeReturnInfo);
objJsonResult.code = "0";
--
Gitblit v1.9.1