From 1948124877478db58b27841f9398aed97ef13053 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期日, 26 十月 2025 17:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 142 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 111 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 413433b..4fe52a8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -480,35 +480,78 @@
try
{
var _value = msg["model"].ToString();
+ LogService.Write("1" + _value);
+ var entry = msg["model"]["HENTRY"].ToString();
+ LogService.Write("1" + _value);
+ LogService.Write("12" + entry);
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鍙嶅簭鍒楀寲
_value = "[" + _value.ToString() + "]";
List<Supplier> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(_value);
+ List<Model.ClsGy_SupplierContact_Model> lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SupplierContact_Model>>(entry);
string sql = string.Empty;
+ LogService.Write("2");
//淇濆瓨
oCN.BeginTran();
sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
+ LogService.Write("3");
oCN.RunProc(sql);
sql = "set identity_insert Gy_Supplier on";
oCN.RunProc(sql);
+ LogService.Write("渚涘簲鍟嗗悓姝�" + @"Insert Into Gy_Supplier " +
+ "(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
+ ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
+ ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,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 + "'" +
+ ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
+ ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
+ ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID + ",'" + lsmain[0].HMaterClass +
+ "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
+ "') ");
oCN.RunProc("Insert Into Gy_Supplier " +
"(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark" +
",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
- ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HERPItemID) " +
+ ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,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 + "'" +
",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+
- "'," + lsmain[0].HItemID +
- ") ");
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ "'," + lsmain[0].HItemID + ",'" + lsmain[0].HUseOrgID + "','" + lsmain[0].HCreateOrgID +
+ "') ");
sql = "set identity_insert Gy_Supplier off";
oCN.RunProc(sql);
+ ///////////
+ foreach (var osub in lssub)
+ {
+ sql = " set identity_insert Gy_SupplierContact on";
+ oCN.RunProc(sql);
+ LogService.Write("寮�濮嬫彃鍏ヤ緵搴斿晢鑱旂郴浜�");
+ sql = $"delete from Gy_SupplierContact where HItemID = {osub.HItemID}";
+ oCN.RunProc(sql);
+ oCN.RunProc("insert into Gy_SupplierContact" +
+ "(HItemID,HNumber,HName,HShortNumber,HParentID,HLevel" +
+ ", HEndFlag, HStopflag, HRemark, HUseFlag, HIsDefault, HUSEORGID, HCREATEORGID) " +
+ " values('" + osub.HItemID + "','" + osub.HNumber + "','" + osub.HName + "'," + "'" + osub.HShortNumber + "'," + osub.HParentID + "," + osub.HLevel + ",'" + osub.HEndFlag + "','" + osub.HStopflag + "'" +
+ "," + "'" + osub.HRemark + "'" + ",'" + osub.HUseFlag + "','" + osub.HIsDefault + "'," + osub.HUSEORGID + "," + osub.HCREATEORGID +
+ ") ");
+ sql = "set identity_insert Gy_SupplierContact off";
+ oCN.RunProc(sql);
+ }
+
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+
+
+ LogService.Write("鎻掑叆渚涘簲鍟嗚仈绯讳汉compelete");
oCN.Commit();
objJsonResult.code = "1";
@@ -519,6 +562,7 @@
}
catch (Exception e)
{
+ LogService.Write(e);
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
@@ -698,6 +742,7 @@
}
catch (Exception e)
{
+
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1011,7 +1056,7 @@
#region [鍚屾鍩虹璧勬枡]
[Route("Gy_Supplier/Gy_SupplierViewApi")]
[HttpGet]
- public json Gy_SupplierViewApi(string Number, string Type)
+ public json Gy_SupplierViewApi(string Number, string Type, string HUseOrgID)
{
string sql = string.Empty;
string sReturn = "";
@@ -1069,14 +1114,23 @@
{
#region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
var json = new
+ // {
+ // CreateOrgId = HUseOrgID,
+ // Number = Number,
+ // Id = ""
+ // };
{
- CreateOrgId = 0,
- Number = Number,
- Id = ""
+ FormId= "BD_Supplier",
+ FieldKeys= "FMASTERID,FNUMBER,FNAME,FFORBIDERID,FCREATEDATE,FCREATEORGID,FUSEORGID,FPAYCONDITION",
+ 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)
@@ -1087,15 +1141,23 @@
objJsonResult.data = null;
return objJsonResult;
}
- //鏌ョ湅 鑾峰彇鏁版嵁
- var _result = InvokeHelper.View("BD_Supplier", JsonConvert.SerializeObject(json));
- var _saveObj = JObject.Parse(_result);
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.Query("BD_Supplier", 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 = "閲戣澏渚涘簲鍟嗗悓姝ュけ璐sonRoot锛�" + _result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ if (_saveObj.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閲戣澏渚涘簲鍟嗗悓姝ュけ璐sonRoot锛�" + _result;
+ objJsonResult.Message = "閲戣澏瀹㈡埛鍚屾澶辫触锛屼娇鐢ㄧ粍缁囧搴旂殑渚涘簲鍟嗕唬鐮佷笉瀛樺湪";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1111,22 +1173,40 @@
#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"],
+ // HPAYCONDITION = _saveObj["Result"]["Result"]["SupplierFinance"][0]["PayCondition_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"],
- 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"],
- HPAYCONDITION = _saveObj["Result"]["Result"]["SupplierFinance"][0]["PayCondition_Id"]
+ 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[0][3].ToString() == "A" ? 0 : 1,
+ HRemark = "CLD-ERP瀵煎叆",
+ HUseFlag = "宸蹭娇鐢�",
+ HMakeTime = _saveObj[0][4],
+ HCREATEORGID = _saveObj[0][5],
+ HUSEORGID = _saveObj[0][6],
+ HPAYCONDITION = _saveObj[0][7]
};
#endregion
// 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
--
Gitblit v1.9.1