From a7941316a0d4945eb2d35fa86ab983c0ec8e6534 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期四, 16 九月 2021 16:05:45 +0800
Subject: [PATCH] 1、工序委外接收单新增修改、审核、反审核功能。 2、修复工序流转卡保存未保存委外标记问题。
---
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 660e6e1..3db4fde 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -31,12 +31,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere, "h_v_Gy_CustomerList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
}
else
{
string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -77,8 +77,17 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_Customer where HItemID=" + HInterID, "Gy_Customer");
-
+ string sql = string.Format(@"select c.HItemID,c.HNumber 瀹㈡埛浠ｇ爜,c.HName 瀹㈡埛鍚嶇О,c.HHelpCode 鍔╄鐮�,c.HShortName 绠�绉�,c.HAddress 鍦板潃,c.HLinkMan 鑱旂郴浜�,c.HLinkPhone 鑱旂郴鐢佃瘽
+ ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠ｈ〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,
+ c.HTaxNum 绋庡姟鐧昏鍙�,c.HTaxRate 澧炲�肩◣鐜�,c.HEnglishName 鑻辨枃鍚嶇О,c.HEngLishAddress 鑻辨枃鍦板潃,c.HCountry 鍥藉,c.HCusStatus 瀹㈡埛鐘舵��
+ ,c.HStopflag 绂佺敤鏍囧織,c.HRemark 澶囨敞,c.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,c.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+ c.HSSID 缁撶畻鏂瑰紡ID,s.HName 缁撶畻鏂瑰紡,c.HCusTypeID 瀹㈡埛鍒嗙被ID,t.HName 瀹㈡埛鍒嗙被 from Gy_Customer c
+ left join Gy_AreaSet a on c.HAreaID=a.HItemID
+ left join Gy_Currency r on c.HCurID=r.HItemID
+ left join Gy_SettleStyle s on c.HSSID=s.HItemID
+ left join Gy_CusType t on c.HCusTypeID=t.HItemID
+ where c.HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "Gy_Customer");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
@@ -255,7 +264,7 @@
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
",HCusTypeID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
- ", " + HLevel + ",0,0,'" + HRemark + "'" +
+ ", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "'," + HTaxRate + ",'" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
@@ -304,10 +313,10 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
- string msg5 = sArray[3].ToString();
+ string msg2 = sArray[0].ToString();//琛ㄥ崟
+ string msg3 = sArray[1].ToString();//id
+ string msg4 = sArray[2].ToString();//褰撳墠鐢ㄦ埛
+ string msg5 = sArray[3].ToString();//鏉冮檺妯″潡浠ｇ爜
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Customer> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(msg2);
@@ -381,14 +390,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -398,7 +399,32 @@
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
",HShortNumber='" + HShortNumber + "'" +
- ",HParentID=" + HParentID +
+ ",HLevel ='" + HLevel + "'" +
+ ",HEndFlag ='" + HEndFlag + "'" +
+ ",HParentID='" + HParentID + "'" +
+ ",HStopflag ='" + HStopflag + "'" +
+ ",HHelpCode ='" + HHelpCode + "'" +
+ ",HShortName ='" + HShortName + "'" +
+ ",HAddress ='" + HAddress + "'" +
+ ",HLinkMan ='" + HLinkMan + "'" +
+ ",HLinkPhone ='" + HLinkPhone + "'" +
+ ",HMobilePhone ='" + HMobilePhone + "'" +
+ ",HFax ='" + HFax + "'" +
+ ",HPostalCode ='" + HPostalCode + "'" +
+ ",HEmail ='" + HEmail + "'" +
+ ",HBank ='" + HBank + "'" +
+ ",HBankAccount ='" + HBankAccount + "'" +
+ ",HTaxNum ='" + HTaxNum + "'" +
+ ",HTaxRate ='" + HTaxRate + "'" +
+ ",HCountry ='" + HCountry + "'" +
+ ",HEnglishName ='" + HEnglishName + "'" +
+ ",HCorMan ='" + HCorMan + "'" +
+ ",HEnglishAddress ='" + HEnglishAddress + "'" +
+ ",HCurID ='" + HCurID + "'" +
+ ",HSSID ='" + HSSID + "'" +
+ ",HAreaID ='" + HAreaID + "'" +
+ ",HCusStatus ='" + HCusStatus + "'" +
+ ",HCusTypeID ='" + HCusTypeID + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1