From 861aefcec45c1843ad20d22a017054d33f78f8b9 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 四月 2025 12:48:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index 0c848c5..d217648 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DLL;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -7,6 +8,7 @@
using System.Data;
using System.Data.SqlClient;
using System.IO;
+using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
@@ -332,7 +334,7 @@
return objJsonResult;
}
else
- {
+ {
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曟嵁鍙凤細"+ oBill.omodel.HBillNo+ " 瀹℃牳鎴愬姛锛�";
@@ -874,6 +876,31 @@
if (bResult)
{
+
+ //鑷姩瀹℃牳璁剧疆
+ if (OperationType == "1")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_Check == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
@@ -1128,9 +1155,98 @@
return objJsonResult;
}
}
- #endregion
+ #endregion
+
+ # region 鎵嬪伐鐐规琛ㄥ嚭鐜癗G鍙戦�佷俊鎭�
+ [Route("SB_EquipICMOTechParamBillController/HSendDDMeg")]
+ [HttpGet]
+
+ public async Task<object> HSendDDMeg(string HInterID)
+ {
+ try
+ {
+ //鏌ヨ瀛愯〃鏄惁鏈塏G鍊�
+ ds = oCn.RunProcReturn("select * from SB_EquipICMOTechParamBillMain a inner join SB_EquipICMOTechParamBillSub b on a.HInterID=b.HInterID where b.HResult='NG' and a.HInterID=" + HInterID, "SB_EquipICMOTechParamBillMain");
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count != 0)
+ {
+ //鏌ヨ骞跺悎骞跺紓甯稿伐鑹哄弬鏁板��
+ string sql = @"SELECT 鐢熶骇杞﹂棿, STUFF((SELECT ', ' + CAST(hsubid AS VARCHAR(10)) FROM h_v_SB_EquipICMOTechParamBillList_Detail AS InnerTable WHERE InnerTable.鐢熶骇杞﹂棿 = OuterTable.鐢熶骇杞﹂棿 AND InnerTable.妫�娴嬬粨鏋� = 'NG' AND InnerTable.hmainid ='"+HInterID+"' FOR XML PATH('')), 1, 2, '') AS hsubid,STUFF(( SELECT '; ' + 璁惧缂栫爜 + ' - ' + 宸ヨ壓鍙傛暟 + ' - 宸ヨ壓鍙傛暟鍊�: ' + CAST(宸ヨ壓鍙傛暟鍊� AS VARCHAR(10)) + ' - 鏍囧噯鍊�: ' + CAST(鏍囧噯鍊� AS VARCHAR(10)) + ' - 涓婇檺: ' + CAST(涓婇檺 AS VARCHAR(10)) + ' - 涓嬮檺: ' + CAST(涓嬮檺 AS VARCHAR(10)) FROM h_v_SB_EquipICMOTechParamBillList_Detail AS InnerTable WHERE InnerTable.鐢熶骇杞﹂棿 = OuterTable.鐢熶骇杞﹂棿 AND InnerTable.妫�娴嬬粨鏋� = 'NG' FOR XML PATH('') ), 1, 2, '') AS 鍐呭 FROM h_v_SB_EquipICMOTechParamBillList_Detail AS OuterTable where OuterTable.hmainid = '" + HInterID + "' GROUP BY 鐢熶骇杞﹂棿";
+ ds = oCn.RunProcReturn(sql, "h_v_SB_EquipICMOTechParamBillList_Detail");
+ var HDeptName = ds.Tables[0].Rows[0]["鐢熶骇杞﹂棿"].ToString();
+ var HDescription = ds.Tables[0].Rows[0]["鍐呭"].ToString();
+ var HSubID = ds.Tables[0].Rows[0]["hsubid"].ToString();
+ //鏌ヨ鎺ユ敹浜�
+ string newSql1 = @"select a.HDingDingUserID 閽夐拤id,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 = '" + HDeptName + "宸ヨ壓寮傚父棰勮鎺ユ敹浜�'";
+ DataSet dt = oCn.RunProcReturn(newSql1, "Gy_Czygl");
+ if (dt.Tables[0].Rows.Count > 0)
+ {
+
+ string appKey = "";
+ string appSecret = "";
+ string sReturn = "";
+ string agentIds = "";
+ Cls_DDMsg msg = new Cls_DDMsg();
+ 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";
+ }
+
+ }
+
+ //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
+ string response = msg.GetAccessToken(appKey, appSecret);
+ JObject responseJson = JObject.Parse(response);
+ // 鑾峰彇access_token鐨勫��
+ string accessToken = responseJson["accessToken"].ToString();
+ string HName = ""; // 鐢ㄤ簬瀛樺偍鎷兼帴鍚庣殑閽夐拤ID
+ List<string> dingDingIds = new List<string>(); // 鐢ㄦ潵瀛樺偍閽夐拤ID鐨勯泦鍚�
+ // 鎷兼帴閽夐拤ID
+ for (int i = 0; i < dt.Tables[0].Rows.Count; i++)
+ {
+ dingDingIds.Add(dt.Tables[0].Rows[i]["閽夐拤id"].ToString()); // 灏嗘瘡涓拤閽塈D娣诲姞鍒板垪琛ㄤ腑
+ }
+
+ // 浣跨敤閫楀彿灏嗛拤閽塈D鎷兼帴鎴愪竴涓瓧绗︿覆
+ HName = string.Join(",", dingDingIds);
+ //鏇存柊涓篘G鐨勫瓙琛ㄥ瓧娈� 鏈� 宸插彂閫� 1
+ oCn.RunProc("update SB_EquipICMOTechParamBillSub set HSendFlag =1 where HInterID='" + HInterID + "' and HEntryID in(" + HSubID + ")");
+ response = await msg.SendTextMessage(accessToken, agentIds, HName, "0", "false", HDescription);
+ return response;
+ }
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏃燦G宸ヨ壓鍙傛暟锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙戦�佸け璐ワ紒" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1