From 7d2677241200a3a1fd110e5d37864571c6d87f67 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 30 十二月 2024 14:10:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 6bf08f4..2bed7c3 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -9,6 +9,7 @@
using System.Web.Http;
using WebAPI.Models;
using System.Text.RegularExpressions;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
public class Gy_SupplierController : ApiController
@@ -79,7 +80,61 @@
}
}
+ #region 渚涘簲鍟嗗垎椤靛垪琛�
+ [Route("Gy_Supplier/page")]
+ [HttpGet]
+ public json Gy_SupplierPage(string sWhere, string user, int page, int size, string Organization)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ sWhere += ("and 缁勭粐鍚嶇О = '" + Organization + "'");
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_SupplierList " + page + "," + size + ",''", "h_p_Gy_SupplierList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_SupplierList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_SupplierList");
+ }
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
/// <summary>
@@ -199,19 +254,8 @@
{
try
{
- string sql = string.Format(@"select s.HItemID,s.HUSEORGID,o.Hname 浣跨敤缁勭粐,s.HCREATEORGID ,d.Hname 鍒涘缓缁勭粐,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode 鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
- ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠ｈ〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,s.HPSStyleID 閲囪喘鏂瑰紡ID,f.HName 閲囪喘鏂瑰紡鍚嶇О,
- s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
- ,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
- s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡,s.HMaterClass 渚涜揣鏉愭枡绫诲埆 from Gy_Supplier s
- left join Gy_AreaSet a on s.HAreaID=a.HItemID
- left join Gy_Currency r on s.HCurID=r.HItemID
- left join Gy_SettleStyle e on s.HSSID=e.HItemID
- left join Xt_ORGANIZATIONS o on s.HUSEORGID=o.HItemID
- left join Xt_ORGANIZATIONS d on s.HCREATEORGID=d.HItemID
- left join Gy_PoStockStyle f on s.HPSStyleID=f.HItemID
- where s.HItemID='" + HInterID + "'");
- ds = oCN.RunProcReturn(sql, "Gy_Supplier");
+ string sql = string.Format(@"select * from h_v_Gy_SupplierEdit where HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierEdit");
DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '"+ HInterID + "'", "Gy_Supplier_PayPlan");
List<Object> list = new List<object>();
list.Add(cs);
@@ -293,6 +337,7 @@
string HRemark = list[0].HRemark;
string HMaterClass = list[0].HMaterClass;
long HPSStyleID = list[0].HPSStyleID;
+ long HSupTypeID = list[0].HSupTypeID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -311,13 +356,13 @@
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID,HPSStyleID,HSupTypeID) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
"," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
- ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID +
+ ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID + "' ,'" + HPSStyleID+ "' ,'" + HSupTypeID +
"') ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -414,6 +459,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
+
[Route("Gy_Supplier/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
@@ -472,6 +518,7 @@
string HRemark = list[0].HRemark;
string HMaterClass = list[0].HMaterClass;
long HPSStyleID = list[0].HPSStyleID;
+ long HSupTypeID = list[0].HSupTypeID;
//鍒ゆ柇鏉冮檺
if (!ClsPub.Security_Log(msg6, 1, false, msg5))
@@ -525,6 +572,7 @@
",HSSID=" + HSSID.ToString() +
",HMaterClass='" + HMaterClass +
"',HPSStyleID='"+ HPSStyleID.ToString() +
+ "',HSupTypeID='" + HSupTypeID.ToString() +
"',HUSEORGID='" + HUseOrgID.ToString() +
"',HCREATEORGID='" + HCreateOrgID.ToString() +
"',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1