From 20b7db8f827c755111e722c7275f420206804c16 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 28 十月 2025 08:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 128 ++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 25 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index f74bb74..5ddbc7e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -228,11 +228,51 @@
,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠ｈ〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,c.HMateOutEmp 棰嗙敤浜�,
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 = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶娣诲姞瀹℃牳浜�
+ /// <summary>
+ /// 瀹㈡埛鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Customer/xg_extendCheckEmp")]
+ [HttpGet]
+ public object xg_extendCheckEmp(long HInterID)
+ {
+ try
+ {
+ 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.HMateOutEmp 棰嗙敤浜�,
+ 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 瀹㈡埛鍒嗙被, c.HCheckEmp 瀹℃牳浜� 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
+ left join Gy_CusType t on c.HCusTypeID=t.HItemID
where c.HItemID='" + HInterID + "'");
ds = oCN.RunProcReturn(sql, "Gy_Customer");
objJsonResult.code = "1";
@@ -626,7 +666,7 @@
",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
- ",HCusTypeID) " +
+ ",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
@@ -636,7 +676,7 @@
"," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
"," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
"," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
- ", " + lsmain[0].HCusTypeID + ")");
+ ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
//涓昏〃_瀹㈡埛
oCN.RunProc("Insert into Gy_Customer " +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
@@ -648,7 +688,7 @@
",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
- ",HCusTypeID,HERPItemID) " +
+ ",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
@@ -658,7 +698,7 @@
"," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
"," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
"," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
- ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ")");
+ ", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
sql = "set identity_insert gy_Customer off";
oCN.RunProc(sql);
//瀹㈡埛_浜よ揣鍦扮偣
@@ -1178,7 +1218,7 @@
#region [鍚屾鍩虹璧勬枡]
[Route("Gy_Customer/Gy_CustomerViewApi")]
[HttpGet]
- public json Gy_CustomerViewApi(string Number, string Type)
+ public json Gy_CustomerViewApi(string Number, string Type, string HUseOrgID)
{
string sql = string.Empty;
string sReturn = "";
@@ -1235,15 +1275,26 @@
else
{
#region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
+ // 浣跨敤鏌ヨ鐨刉EBAPI 鏃犳硶婊¤冻鎸夌収 浣跨敤缁勭粐鏇存柊鏁版嵁鐨勮姹傦紝鏀逛负浣跨敤鍗曟嵁鏌ヨ
var json = new
+ // {
+ // CreateOrgId = HUseOrgID,
+ // Number = Number,
+ // Id = ""
+ // };
{
- CreateOrgId = 0,
- Number = Number,
- Id = ""
+ FormId = "BD_Customer",
+ FieldKeys = "FMASTERID,FNUMBER,FNAME,FFORBIDDERID,FCREATEDATE,FCREATEORGID,FUSEORGID",
+ FilterString = $@"FNumber='{Number}' AND FUseOrgID={HUseOrgID}",
+ OrderString = "",
+ TopRowCount = 0,
+ StartRow = 0,
+ Limit = 0
};
- #region [閲戣澏閮ㄥ垎]
- //鐧诲綍閲戣澏
- var loginRet = InvokeHelper.Login();
+
+ #region [閲戣澏閮ㄥ垎]
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
//鍒ゆ柇鏄惁鐧诲綍鎴愬姛
if (isSuccess < 0)
@@ -1255,14 +1306,23 @@
return objJsonResult;
}
//鏌ョ湅 鑾峰彇鏁版嵁
- var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
- var _saveObj = JObject.Parse(_result);
+ // var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
+ var _result = InvokeHelper.Query("BD_Customer", JsonConvert.SerializeObject(json));
+ var _saveObj = JArray.Parse(_result);
//鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
- if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触jsonRoot锛�" + _result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ if (_saveObj.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触jsonRoot锛�" + _result;
+ objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑瀹㈡埛浠ｇ爜涓嶅瓨鍦�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1278,23 +1338,41 @@
#region [琛ㄦ暟鎹祴鍊糫
var jsonData = new
+ // {
+ // HItemID = _saveObj["Result"]["Result"]["Id"],
+ // HERPItemID = _saveObj["Result"]["Result"]["Id"],
+ // HNumber = _saveObj["Result"]["Result"]["Number"],
+ // HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
+ // HShortNumber = _saveObj["Result"]["Result"]["Number"],
+ // HParentID = 0,
+ // HLevel = 1,
+ // HEndFlag = 1,
+ // HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+ // HRemark = "CLD-ERP瀵煎叆",
+ // HUseFlag = "宸蹭娇鐢�",
+ // HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
+ // HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
+ // HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+ // };
{
- HItemID = _saveObj["Result"]["Result"]["Id"],
- HERPItemID = _saveObj["Result"]["Result"]["Id"],
- HNumber = _saveObj["Result"]["Result"]["Number"],
- HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
- HShortNumber = _saveObj["Result"]["Result"]["Number"],
+ HItemID = _saveObj[0][0],
+ HERPItemID = _saveObj[0][0],
+ HNumber = _saveObj[0][1],
+ HName = _saveObj[0][2],
+ HShortNumber = _saveObj[0][1],
HParentID = 0,
HLevel = 1,
HEndFlag = 1,
- HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+ HStopflag = _saveObj[0][3].ToString() == "A" ? 0 : 1,
HRemark = "CLD-ERP瀵煎叆",
HUseFlag = "宸蹭娇鐢�",
- HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
- HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
- HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
+ HMakeTime = _saveObj[0][4],
+ HCREATEORGID = _saveObj[0][5],
+ HUSEORGID = _saveObj[0][6],
};
#endregion
+
+ LogService.Write("jsonData: " + jsonData);
// 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
sql = $"delete from Gy_Customer where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
oCN.RunProc(sql);
--
Gitblit v1.9.1