From ce58bfdb73054fa181e0731d60f4c2e74798cabb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 27 deletions(-)
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 06f4011..0a6bfe8 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -74,9 +74,12 @@
}
#region 鍙橀噺
- private string AppKey = "dingiokapm2dvjrhzl2g"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppKey銆�
- private string AppSecret = "dPUD7tN3BGVYAC4lDzhpcBH7O4FWFDdjLJWa6cVRBQj5U7GJ4Gwr7Vohnv0oPBOr"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppSecret銆�
- private long AgentID = 3188176952; //搴旂敤鐨凙gentId
+ //private string AppKey = "dingiokapm2dvjrhzl2g"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppKey銆�
+ //private string AppSecret = "dPUD7tN3BGVYAC4lDzhpcBH7O4FWFDdjLJWa6cVRBQj5U7GJ4Gwr7Vohnv0oPBOr"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppSecret銆�
+ //private long AgentID = 3188176952; //搴旂敤鐨凙gentId
+ private string AppKey = "dingj3hskhwk8jioofub"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppKey銆�
+ private string AppSecret = "qGPbXJGJtFI__FYGdzZPIjHZP_o1jI1KnM4_bbKx9AUuXcYqr3UN6nkQeSe8GcT7"; //宸插垱寤虹殑浼佷笟鍐呴儴搴旂敤鐨凙ppSecret銆�
+ private long AgentID = 3553515838; //搴旂敤鐨凙gentId
public string accessToken = ""; //璋冪敤璇ユ帴鍙ｇ殑璁块棶鍑瘉銆�
private string ProcessInstanceId = ""; //瀹℃壒瀹炰緥ID銆�
#endregion
@@ -593,6 +596,7 @@
#region 鑾峰彇 瀹滄惌鎸囧畾鍗曟嵁鐨勫疄渚婭D鍒楄〃--鎸囧畾鍒嗛〉鐨勬暟鎹�
public bool getInstanceIDList_Page_YiDa(string appType, string systemToken, string userID, string formUuid, int pageNumber, int pageSize, ref YD_GetInstanceIDListResponse response, ref string msg)
{
+ LogService.Write("鏌ョ湅4-浼犻�掑弬鏁�:appType=" + appType + ",systemToken=" + systemToken + ",formUuid=" + formUuid + ",userID=" + userID + ",pageSize=" + pageSize + ",pageNumber=" + pageNumber+ ",accessToken="+ this.accessToken);
AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient4();
AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceIdListHeaders getInstanceIdListHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetInstanceIdListHeaders();
getInstanceIdListHeaders.XAcsDingtalkAccessToken = this.accessToken;
@@ -639,7 +643,9 @@
{
// err 涓惈鏈� code 鍜� message 灞炴�э紝鍙府鍔╁紑鍙戝畾浣嶉棶棰�
}
+
msg = "閿欒浠ｇ爜" + err.Code + "锛�" + err.Message;
+ LogService.Write("鏌ョ湅4-鎶ラ敊淇℃伅1:"+ msg);
return false;
}
@@ -654,6 +660,7 @@
// err 涓惈鏈� code 鍜� message 灞炴�э紝鍙府鍔╁紑鍙戝畾浣嶉棶棰�
}
msg = "閿欒浠ｇ爜" + err.Code + "锛�" + err.Message;
+ LogService.Write("鏌ョ湅4-鎶ラ敊淇℃伅2:" + msg);
return false;
}
}
@@ -662,6 +669,7 @@
#region 鑾峰彇 瀹滄惌鎸囧畾鍗曟嵁鐨勫疄渚婭D鍒楄〃
public bool getInstanceIDList_YiDa(string appType, string systemToken, string userID, string formUuid, int pageNumber, int pageSize, ref List<string> IDList, ref string msg)
{
+ LogService.Write("鏌ョ湅4-1鏌ヨ");
YD_GetInstanceIDListResponse response = new YD_GetInstanceIDListResponse();
do
{
@@ -980,7 +988,7 @@
return false;
}
-
+ LogService.Write("鏌ョ湅1-鏁版嵁鏌ヨ1");
for (int i = 0; i < response.Body.Result.Count; i++)
{
try
@@ -1028,6 +1036,7 @@
// oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
//}
+ LogService.Write("鏌ョ湅1-鏁版嵁鏌ヨ-寰幆閲岄潰2:"+ oItem.HInstanceID);
//绛惧埌琛�
if (keys.Contains("dateField_ls9ma7h3"))
@@ -1036,9 +1045,9 @@
oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
}
- if (keys.Contains("selectField_ls9ma7h9"))
+ if (keys.Contains("textField_mc8uekgv"))
{
- oItem.HArea = response.Body.Result[i].FormData["selectField_ls9ma7h9"].ToString().Replace("'", "");
+ oItem.HArea = response.Body.Result[i].FormData["textField_mc8uekgv"].ToString().Replace("'", "");
}
if (keys.Contains("selectField_ls9ma7h7"))
@@ -1056,7 +1065,7 @@
oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_ls9ma7h5_id"])[0].ToString().Replace("'", "");
}
-
+ LogService.Write("鏌ョ湅1-鏁版嵁鏌ヨ-寰幆閲岄潰3:鑾峰彇瀹炰緥鐘舵��:"+ oItem.HInstanceStatus);
//鑾峰彇瀹炰緥鐘舵��
GetInstanceByIdResponse response1 = new GetInstanceByIdResponse();
@@ -1097,7 +1106,7 @@
oItem.HApprovedResult = "";
}
-
+ LogService.Write("鏌ョ湅1-鏁版嵁鏌ヨ-寰幆閲岄潰4:鏁版嵁鏂板:" + oItem.HApprovedResult);
lsmain.Add(oItem);
}catch(Exception e)
@@ -1156,7 +1165,8 @@
try
{
- oCN.BeginTran();
+ LogService.Write("鏌ョ湅1-鏂板鏁版嵁");
+ oCN.BeginTran();
foreach (YD_FenCengShenHeQianDaoBiao oItem in lsmain)
{
string sql_searchRepeat = "select * from DD_FenCengShenHeQianDaoBiao where HInstanceID = '" + oItem.HInstanceID + "'";
@@ -1194,10 +1204,12 @@
oCN.RunProc(sql_main);
}
oCN.Commit();
+ LogService.Write("鏌ョ湅1-鏂板鏁版嵁缁撴潫");
return true;
}catch(Exception e)
{
msg = e.Message;
+ LogService.Write("鏌ョ湅1-鎶ラ敊" + msg);
oCN.RollBack();
return false;
}
@@ -1759,7 +1771,7 @@
return false;
}
-
+ LogService.Write("鏌ョ湅4-寰幆-鏌ヨ鏁版嵁");
for (int i = 0; i < response.Body.Result.Count; i++)
{
try
@@ -1775,6 +1787,8 @@
oItem.HUpdateDate = response.Body.Result[i].ModifiedTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", ""); ;
oItem.HInstanceID = response.Body.Result[i].FormInstanceId.Replace("'", ""); ;
oItem.HOriginator = response.Body.Result[i].Originator.Name.NameInChinese.Replace("'", ""); ;
+
+ LogService.Write("鏌ョ湅4-寰幆-鑾峰彇id-鏌ヨ鏁版嵁"+ oItem.HInstanceID);
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
@@ -1795,6 +1809,8 @@
{
return false;
}
+
+ LogService.Write("鏌ョ湅4-寰幆-鑾峰彇鐘舵��-鏌ヨ鏁版嵁" + oItem.HInstanceStatus);
oItem.HInstanceStatus = response1.Body.InstanceStatus;
if (oItem.HInstanceStatus == "RUNNING")
@@ -1916,6 +1932,8 @@
oItem.HQuestion_Duty = sub2List;
+ LogService.Write("鏌ョ湅4-寰幆-鏂板缁撴潫-鏌ヨ鏁版嵁" + oItem.HQuestion_Duty.Count);
+
lsmain.Add(oItem);
}
catch (Exception e)
@@ -1957,9 +1975,10 @@
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
{
+ LogService.Write("鏌ョ湅4-1-杩斿洖");
return false;
}
-
+ LogService.Write("鏌ョ湅4-1");
//鑾峰彇璇︾粏淇℃伅骞堕檮鍔犲埌鍒楄〃lsmain涓�
List<YD_QRQCWenTiTiJiaoBiao> lsmain = new List<YD_QRQCWenTiTiJiaoBiao>();
if (getInstanceDetailList_QRQCWenTiTiJiaoBiao__YiDa(appType, systemToken, userID, formUuid, IDList, ref lsmain, ref msg) == false)
@@ -1969,6 +1988,7 @@
try
{
+ LogService.Write("鏌ョ湅4-鏂板");
oCN.BeginTran();
foreach (YD_QRQCWenTiTiJiaoBiao oItem in lsmain)
{
@@ -2055,11 +2075,13 @@
}
oCN.Commit();
+ LogService.Write("鏌ョ湅4-鏂板缁撴潫");
return true;
}
catch (Exception e)
{
msg = e.Message;
+ LogService.Write("鏌ョ湅4-鏂板鎶ラ敊:"+ msg);
oCN.RollBack();
return false;
}
@@ -2343,7 +2365,7 @@
HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate)) {
//淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
- oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
}
}
}
@@ -2370,7 +2392,7 @@
if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
{
//淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
- oCN.RunProc("update Gy_MouldFileMain set HMouldStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
}
}
oItem.HMouldID = long.Parse(HMouldID);
@@ -3587,20 +3609,43 @@
string msg = "";
try
{
- //if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + msg;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ if ( oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //娣诲悍涓撶敤
+ if (getData_ErrWorkTimesRequest(startTime, endTime, ref msg) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹㈡埛閿欒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
catch (Exception e)
{
--
Gitblit v1.9.1