From c81d254683929d9f3599694783c68499431a336b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 26 七月 2024 10:30:38 +0800
Subject: [PATCH] 条码自动生成：断线重连时间间隔为5秒
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 1ba08b5..b0a1306 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -6623,13 +6623,31 @@
/// <returns></returns>
public async Task<object> SendDingDingAsync(string HSendMan, int HHandleEmpID,string HDescription,string HCopyMan)
{
+
string concatenatedNames = "";
+ string appKey = "";
+ string appSecret = "";
+ string sReturn = "";
+ string agentIds = "";
Cls_DDMsg msg = new Cls_DDMsg();
- string appKey = "dingrsrzhdyn3mlaof95";
- string appSecret = "RAqH6YtZnPLCpDbuqfaYQkKkVtVdS0wqfC8I26X6qiS-8eoCJCNrzx3fubGND4Sq";
- //鏂帿灏�
- //string appKey = "dingkdddbhdcssk7jduw";
- //string appSecret = "iv07c-GLfJPnzfJaNAAOfJDl3Z-eODvDAhlInMZCZhGorkle5Evbaxx3ImylvdjQ";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁 N涓烘湰鍦帮紝Y涓烘柉鑾皵
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_SendDingDingMsg == "N")
+ {
+ appKey = "dingrsrzhdyn3mlaof95";
+ appSecret = "RAqH6YtZnPLCpDbuqfaYQkKkVtVdS0wqfC8I26X6qiS-8eoCJCNrzx3fubGND4Sq";
+ agentIds = "3118119317";
+ }
+ else if (oSystemParameter.omodel.OA_ErrMsgBackBill_SendDingDingMsg == "Y")
+ {
+ appKey = "dingkdddbhdcssk7jduw";
+ appSecret = "iv07c-GLfJPnzfJaNAAOfJDl3Z-eODvDAhlInMZCZhGorkle5Evbaxx3ImylvdjQ";
+ agentIds = "3151454458";
+ }
+
+ }
+
if (HHandleEmpID==0) //寮傚父鍙嶉楠屾敹鍗曚繚瀛� 灏嗘秷鎭� 鍙戦�佺粰 鎺ユ敹浜猴紝鎸囨淳澶勭悊浜猴紝鍏ㄩ儴鎶勯�佷汉
{
string HReceiveMan = HSendMan;
@@ -6657,7 +6675,7 @@
//鑾峰彇鍙戦�佷汉 鎺ユ敹浜�
string HReceiveMan = HCopyMan;
string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
- ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+ ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
List<string> HNames = new List<string>();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
@@ -6675,6 +6693,7 @@
string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
//鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
+ LogService.CustomWriteLog("10鍙傛暟" + sql1, "寮傚父缃氭");
ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
List<string> HNames = new List<string>();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -6684,6 +6703,7 @@
}
concatenatedNames = string.Join(",", HNames);
+ LogService.CustomWriteLog("9鍙傛暟" + concatenatedNames, "寮傚父缃氭");
}
//鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
@@ -6693,7 +6713,7 @@
string accessToken = responseJson["accessToken"].ToString();
//璋冪敤鏂规硶鍙戦�佹秷鎭�
- string agentId = "3118119317";//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
+ string agentId = agentIds;//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
string userIdList = concatenatedNames;//閽夐拤浜哄憳鐨刬d
string deptIdList = "0"; // 绌哄瓧绗︿覆琛ㄧず涓嶆寚瀹氶儴闂�
string toAllUser = "false";
@@ -6839,18 +6859,28 @@
{
try
{
+ //string sReturn = "";
List<object> columnNameList = new List<object>();
//鏍规嵁褰撳墠浜鸿幏鍙栬亴鍔�
string sql = "select a.Czymc 鐢ㄦ埛鍚嶇О,c.GroupName 鑱屽姟 from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc = '"+HName+"'";
ds = oCN.RunProcReturn(sql, "Gy_ErrMsgBackType");
string Job = ds.Tables[0].Rows[0]["鑱屽姟"].ToString();
- //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓婄骇
- string sql1 = "select * from Gy_Duty where HParentID=(select HParentID from Gy_Duty where HItemID =(select HParentID from Gy_Duty group by HParentID, HName having HName = '"+Job+"' and count(*) = 1))";
- ds = oCN.RunProcReturn(sql1, "Gy_Duty");
+ if (Job=="娉ㄥ鐝粍闀�" || Job=="鍚庡鐞嗙彮缁勯暱")
+ {
+ //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓嬬骇,缁欏彂閫佷汉榛樿涓虹彮缁勯暱涔嬩笅
+ string sql1 = "select * from Gy_Duty where HParentID =(select HItemID from Gy_Duty group by HItemID, HName having HName = '"+Job+"' and count(*) = 1)";
+ ds = oCN.RunProcReturn(sql1, "Gy_Duty");
+ }
+ else
+ {
+ //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓婄骇
+ string sql2 = "select * from Gy_Duty where HItemID =(select HParentID from Gy_Duty group by HParentID, HName having HName = '" + Job + "' and count(*) = 1)";
+ ds = oCN.RunProcReturn(sql2, "Gy_Duty");
+ }
string Job1= ds.Tables[0].Rows[0]["HName"].ToString();
- //鐢ㄤ笂绾х殑鑱屽姟鎵惧埌鐢ㄦ埛
- string sql2 = "select a.Czymc 鐢ㄦ埛鍚嶇О from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId left join System_UserGroup c on b.GroupId = c.GroupID where c.GroupName = '"+Job1+"'";
- ds = oCN.RunProcReturn(sql2, "Gy_Czygl");
+ //鐢ㄨ亴鍔℃壘鍒扮敤鎴�
+ string sql3 = "select a.Czymc 鐢ㄦ埛鍚嶇О,c.GroupName 鑱屽姟 from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId left join System_UserGroup c on b.GroupId = c.GroupID where c.GroupName = '" + Job1+"'";
+ ds = oCN.RunProcReturn(sql3, "Gy_Czygl");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
--
Gitblit v1.9.1