BLL/bin/Release/BLL.dllBinary files differ
BLL/bin/Release/BLL.pdbBinary files differ
BLL/bin/Release/DAL.dllBinary files differ
BLL/bin/Release/DAL.pdbBinary files differ
BLL/bin/Release/DBUtility.dllBinary files differ
BLL/bin/Release/DBUtility.pdbBinary files differ
BLL/bin/Release/Model.dllBinary files differ
BLL/bin/Release/Model.pdbBinary files differ
BLL/bin/Release/Pub_Class.dllBinary files differ
BLL/bin/Release/Pub_Class.pdbBinary files differ
BLL/bin/Release/Pub_Control.dllBinary files differ
BLL/bin/Release/Pub_Control.pdbBinary files differ
BLL/bin/Release/SQLHelper.dllBinary files differ
BLL/bin/Release/SQLHelper.pdbBinary files differ
BLL/bin/x86/Release/BLL.dllBinary files differ
BLL/bin/x86/Release/BLL.pdbBinary files differ
BLL/bin/x86/Release/DAL.dllBinary files differ
BLL/bin/x86/Release/DAL.pdbBinary files differ
BLL/bin/x86/Release/DBUtility.dllBinary files differ
BLL/bin/x86/Release/DBUtility.pdbBinary files differ
BLL/bin/x86/Release/Model.dllBinary files differ
BLL/bin/x86/Release/Model.pdbBinary files differ
BLL/bin/x86/Release/Pub_Class.dllBinary files differ
BLL/bin/x86/Release/Pub_Class.pdbBinary files differ
BLL/bin/x86/Release/Pub_Control.dllBinary files differ
BLL/bin/x86/Release/Pub_Control.pdbBinary files differ
BLL/bin/x86/Release/SQLHelper.dllBinary files differ
BLL/bin/x86/Release/SQLHelper.pdbBinary files differ
BLL/bin/x86/Release/TopSdk.dllBinary files differ
BLL/bin/x86/Release/TopSdk.pdbBinary files differ
DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
DAL/bin/Release/DBUtility.dllBinary files differ
DAL/bin/Release/DBUtility.pdbBinary files differ
DAL/bin/Release/Model.dllBinary files differ
DAL/bin/Release/Model.pdbBinary files differ
DAL/bin/Release/Pub_Class.dllBinary files differ
DAL/bin/Release/Pub_Class.pdbBinary files differ
DAL/bin/Release/Pub_Control.dllBinary files differ
DAL/bin/Release/Pub_Control.pdbBinary files differ
DAL/bin/Release/SQLHelper.dllBinary files differ
DAL/bin/Release/SQLHelper.pdbBinary files differ
DAL/bin/x86/Release/DAL.dllBinary files differ
DAL/bin/x86/Release/DAL.pdbBinary files differ
DAL/bin/x86/Release/DBUtility.dllBinary files differ
DAL/bin/x86/Release/DBUtility.pdbBinary files differ
DAL/bin/x86/Release/Model.dllBinary files differ
DAL/bin/x86/Release/Model.pdbBinary files differ
DAL/bin/x86/Release/Pub_Class.dllBinary files differ
DAL/bin/x86/Release/Pub_Class.pdbBinary files differ
DAL/bin/x86/Release/Pub_Control.dllBinary files differ
DAL/bin/x86/Release/Pub_Control.pdbBinary files differ
DAL/bin/x86/Release/SQLHelper.dllBinary files differ
DAL/bin/x86/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/Release/DBUtility.dllBinary files differ
DBUtility/bin/Release/DBUtility.pdbBinary files differ
DBUtility/bin/Release/Pub_Class.dllBinary files differ
DBUtility/bin/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/Release/Pub_Control.dllBinary files differ
DBUtility/bin/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/Release/SQLHelper.dllBinary files differ
DBUtility/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/x86/Release/DBUtility.dllBinary files differ
DBUtility/bin/x86/Release/DBUtility.pdbBinary files differ
DBUtility/bin/x86/Release/Pub_Class.dllBinary files differ
DBUtility/bin/x86/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/x86/Release/Pub_Control.dllBinary files differ
DBUtility/bin/x86/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/x86/Release/SQLHelper.dllBinary files differ
DBUtility/bin/x86/Release/SQLHelper.pdbBinary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.CacheBinary files differ
DBUtility/obj/Release/DBUtility.dllBinary files differ
DBUtility/obj/Release/DBUtility.pdbBinary files differ
Model/bin/Release/DBUtility.dllBinary files differ
Model/bin/Release/DBUtility.pdbBinary files differ
Model/bin/Release/Model.dllBinary files differ
Model/bin/Release/Model.pdbBinary files differ
Model/bin/Release/Pub_Class.dllBinary files differ
Model/bin/Release/Pub_Class.pdbBinary files differ
Model/bin/Release/Pub_Control.dllBinary files differ
Model/bin/Release/Pub_Control.pdbBinary files differ
Model/bin/Release/SQLHelper.dllBinary files differ
Model/bin/Release/SQLHelper.pdbBinary files differ
Model/bin/x86/Release/DBUtility.dllBinary files differ
Model/bin/x86/Release/DBUtility.pdbBinary files differ
Model/bin/x86/Release/Model.dllBinary files differ
Model/bin/x86/Release/Model.pdbBinary files differ
Model/bin/x86/Release/Pub_Class.dllBinary files differ
Model/bin/x86/Release/Pub_Class.pdbBinary files differ
Model/bin/x86/Release/Pub_Control.dllBinary files differ
Model/bin/x86/Release/Pub_Control.pdbBinary files differ
Model/bin/x86/Release/SQLHelper.dllBinary files differ
Model/bin/x86/Release/SQLHelper.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.dllBinary files differ
Model/obj/Release/Model.pdbBinary files differ
Model/obj/x86/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/x86/Release/Model.dllBinary files differ
Model/obj/x86/Release/Model.pdbBinary files differ
Pub_Class/bin/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/Release/Pub_Class.pdbBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/x86/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/Release/Pub_Control.pdbBinary files differ
Pub_Control/bin/x86/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/x86/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/x86/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/x86/Release/Pub_Control.pdbBinary files differ
SQLHelper/bin/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/Release/SQLHelper.pdbBinary files differ
SQLHelper/bin/x86/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/x86/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/x86/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/x86/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/x86/Release/SQLHelper.pdbBinary files differ
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -13,8 +13,10 @@ using System.Threading.Tasks; using System.Web.Http; using WebAPI.Models; using WebAPI.Service; using System.Threading; using SyntacticSugar.constant; using WebApiWithFleck; namespace WebAPI.Controllers.SCGL { @@ -7793,6 +7795,12 @@ objJsonResult.data = null; return objJsonResult; } // 个推方式推送数据 GeTuiService.PubishSingle(HInterID); // webSocket方式推送数据 // WebSocketServer.PushOne(HInterID); } if (IsAudit == 1) //反审核提交 { WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1708,8 +1708,8 @@ return objJsonResult; } if (oSystemParameter.omodel.WMS_CampanyName == "锦隆") { //if (oSystemParameter.omodel.WMS_CampanyName == "锦隆") //{ string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID @@ -1726,7 +1726,7 @@ objJsonResult.data = null; return objJsonResult; } } //} @@ -1737,11 +1737,11 @@ model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织 model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织 //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门 if (oSystemParameter.omodel.WMS_CampanyName == "锦隆") { LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName); // if (oSystemParameter.omodel.WMS_CampanyName == "锦隆") // { model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员 } // } model.Add("FISSYNCED", "false");// 是否已同步 model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 报检日期 model.Add("FBillNo", HBillNo); @@ -1861,83 +1861,84 @@ Ids = fID, }; K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud"); // K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/"); // 锦隆 仅保留新建功能 //result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交 //// result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核 //if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") //{ //oCN.RollBack(); //objJsonResult.code = "0"; //objJsonResult.count = 0; //objJsonResult.Message = $"来料检验单号：{fBillNo}，提交失败" + result; //objJsonResult.data = null; //return objJsonResult; //} //else //{ result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交 // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核 if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"来料检验单号：{fBillNo}，提交失败" + result; objJsonResult.data = null; return objJsonResult; } else { //DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList"); DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList"); //for (var i = 0; i < ds1.Tables[0].Rows.Count; i++) //{ //string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]); //string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]); for (var i = 0; i < ds1.Tables[0].Rows.Count; i++) { string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFileName"]); string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HFilePath"]); //string path = HFilePath; //FileInfo fi = new FileInfo(path); //long len = fi.Length; //byte[] buffer = new byte[len]; //FileStream fs = new FileStream(path, FileMode.Open); //fs.Read(buffer, 0, (int)len); ////文件IO流 //string a = Convert.ToBase64String(buffer); string path = HFilePath; FileInfo fi = new FileInfo(path); long len = fi.Length; byte[] buffer = new byte[len]; FileStream fs = new FileStream(path, FileMode.Open); fs.Read(buffer, 0, (int)len); //文件IO流 string a = Convert.ToBase64String(buffer); //if(oSystemParameter.omodel.WMS_CampanyName == "锦隆") //{ ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL"); //} //else //{ // ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL"); //} ////if(oSystemParameter.omodel.WMS_CampanyName == "锦隆") ////{ //ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL"); ////} ////else ////{ //// ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL"); ////} HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString()); //HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString()); string jsonStr = "{" + " \"FileName\":\"" + HFileName + "\"," + " \"FormId\":\"QM_InspectBill\"," + " \"IsLast\":\"true\"," + " \"InterId\":\"" + HInterID + "\"," + " \"BillNo\":\"" + HBillNo + "\"," + " \"AliasFileName\":\"test\"," + " \"SendByte\":\"" + a + "\"" + "}"; // 下面的方式适用于 金蝶云 8.0以上版本 string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr); LogService.Write("json:" + jsonStr); LogService.Write("_vlog:" + _vlog); //string jsonStr = "{" + //" \"FileName\":\"" + HFileName + "\"," + //" \"FormId\":\"QM_InspectBill\"," + //" \"IsLast\":\"true\"," + //" \"InterId\":\"" + HInterID + "\"," + //" \"BillNo\":\"" + HBillNo + "\"," + //" \"AliasFileName\":\"test\"," + //" \"SendByte\":\"" + a + "\"" + //"}"; //// 下面的方式适用于 金蝶云 8.0以上版本 //string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr); //LogService.Write("json:" + jsonStr); //LogService.Write("_vlog:" + _vlog); if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"来料检验单号：{fBillNo}，照片同步失败" + _vlog; objJsonResult.data = null; return objJsonResult; } //if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") //{ //oCN.RollBack(); //objJsonResult.code = "0"; //objJsonResult.count = 0; //objJsonResult.Message = $"来料检验单号：{fBillNo}，照片同步失败" + _vlog; //objJsonResult.data = null; //return objJsonResult; //} // 下面的方式适用于 金蝶云 8.0以下版本 // var ret = client.AttachmentUpload(jsonStr); } //// 下面的方式适用于 金蝶云 8.0以下版本 //// var ret = client.AttachmentUpload(jsonStr); //} } //} oCN.Commit(); objJsonResult.code = "0"; WebAPI/Controllers/WebAPIController.cs
@@ -23175,5 +23175,67 @@ } } #endregion #region 用于连接的健康度检验，只要能访问通这个接口，则表明连接可用 [Route("Health")] [HttpGet] public IHttpActionResult CheckHealth() { // 返回 200 状态码 确认健康状态 return Ok(); } #endregion #region 登录用户与设备ClientID 的关系 写入数据库 [Route("Web/SetGy_UserClientIdConnection")] [HttpPost] public object SetGy_UserClientIdConnection([FromBody] JObject msg) { DataSet ds; oCN.BeginTran(); try { LogService.Write($@"exec h_p_SetGy_UserClientIdRelation @HUserbm=N'{msg["HUserbm"].ToString()}', @HUserName=N'{msg["HUserName"].ToString()}', @HClientID=N'{msg["HClientID"].ToString()}', @HOnline={msg["HOnline"].ToString()} ", "h_p_SetGy_UserClientIdRelation"); ds = oCN.RunProcReturn($@"exec h_p_SetGy_UserClientIdRelation @HUserbm=N'{msg["HUserbm"].ToString()}', @HUserName=N'{msg["HUserName"].ToString()}', @HClientID=N'{msg["HClientID"].ToString()}', @HOnline={msg["HOnline"].ToString()} ", "h_p_SetGy_UserClientIdRelation"); if(ds.Tables[0].Rows[0]["HStatus"].ToString() == "1") { oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "保存设备信息成功！"; objJsonResult.data = null; return objJsonResult; } else { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存设备信息失败！" + ds.Tables[0].Rows[0]["msg"]; objJsonResult.data = null; return objJsonResult; } }catch(Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存设备信息失败！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/DLL/GetuiServerApiSDK.dllBinary files differ
WebAPI/DLL/GetuiServerApiSDK.dll.config
New file @@ -0,0 +1,72 @@ <?xml version="1.0" encoding="utf-8" ?> <configuration> <configSections> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net-net-1.0"/> </configSections> <log4net> <root> <level value="ALL"/> <appender-ref ref="RollingFileAppender-error"/> <appender-ref ref="RollingFileAppender-debug"/> <appender-ref ref="RollingFileAppender-info"/> </root> <appender name="RollingFileAppender-error" type="log4net.Appender.RollingFileAppender"> <file value="gt_error_" /> <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/> <datePattern value="yyyyMMdd".log"" /> <rollingStyle value="Date" /> <appendToFile value="true" /> <staticLogFileName value="false" /> <layout type="log4net.Layout.PatternLayout"> <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/> </layout> <filter type="log4net.Filter.LevelRangeFilter"> <param name="LevelMin" value="ERROR"/> <param name="LevelMax" value="ERROR"/> </filter> </appender> <appender name="RollingFileAppender-debug" type="log4net.Appender.RollingFileAppender"> <file value="gt_debug_" /> <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/> <datePattern value="yyyyMMdd".log"" /> <rollingStyle value="Date" /> <appendToFile value="true" /> <staticLogFileName value="false" /> <layout type="log4net.Layout.PatternLayout"> <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/> </layout> <filter type="log4net.Filter.LevelRangeFilter"> <param name="LevelMin" value="DEBUG"/> <param name="LevelMax" value="DEBUG"/> </filter> </appender> <appender name="RollingFileAppender-info" type="log4net.Appender.RollingFileAppender"> <file value="gt_info_" /> <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/> <datePattern value="yyyyMMdd".log"" /> <rollingStyle value="Date" /> <appendToFile value="true" /> <staticLogFileName value="false" /> <layout type="log4net.Layout.PatternLayout"> <param name="ConversionPattern" value="%d [%t] %-5p %c - Line:%L %m%n"/> </layout> <filter type="log4net.Filter.LevelRangeFilter"> <param name="LevelMin" value="INFO"/> <param name="LevelMax" value="INFO"/> </filter> </appender> </log4net> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> </startup> </configuration> WebAPI/DLL/Google.ProtocolBuffers.dllBinary files differ
WebAPI/Global.asax.cs
@@ -12,14 +12,14 @@ protected void Application_Start() { // webSocket 服务 WebSocketServer.Start(); // WebSocketServer.Start(); GlobalConfiguration.Configure(WebApiConfig.Register); } // 应用关闭时，停止服务，防止泄露 protected void Application_End() { WebSocketServer.Stop(); // WebSocketServer.Stop(); } } } WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl> <History>True|2026-01-15T05:04:43.0602637Z;</History> <History>True|2026-01-19T07:58:34.1439056Z;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -45,31 +45,40 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>01/15/2026 13:04:09</publishTime> <publishTime>01/19/2026 15:56:17</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>01/15/2026 13:04:09</publishTime> <publishTime>01/19/2026 15:56:17</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>01/15/2026 13:04:05</publishTime> <publishTime>01/19/2026 15:56:14</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>01/15/2026 13:04:05</publishTime> <publishTime>01/19/2026 15:56:14</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>01/15/2026 13:03:56</publishTime> <publishTime>01/19/2026 15:56:07</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>01/15/2026 13:03:56</publishTime> <publishTime>01/19/2026 15:56:07</publishTime> </File> <File Include="bin/Fleck.dll"> <publishTime>04/22/2021 11:48:12</publishTime> </File> <File Include="bin/GetuiServerApiSDK.dll"> <publishTime>12/13/2018 15:35:36</publishTime> </File> <File Include="bin/GetuiServerApiSDK.dll.config"> <publishTime>12/12/2018 17:49:02</publishTime> </File> <File Include="bin/Google.ProtocolBuffers.dll"> <publishTime>12/12/2018 17:31:14</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -114,10 +123,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>01/15/2026 13:03:58</publishTime> <publishTime>01/19/2026 15:56:08</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>01/15/2026 13:03:58</publishTime> <publishTime>01/19/2026 15:56:08</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/21/2025 11:46:16</publishTime> @@ -150,34 +159,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>01/15/2026 13:03:54</publishTime> <publishTime>01/19/2026 15:56:02</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>01/15/2026 13:03:54</publishTime> <publishTime>01/19/2026 15:56:02</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>01/15/2026 13:03:55</publishTime> <publishTime>01/19/2026 15:56:03</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>01/15/2026 13:03:55</publishTime> <publishTime>01/19/2026 15:56:03</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>01/15/2026 13:03:55</publishTime> <publishTime>01/19/2026 15:56:05</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>01/15/2026 13:03:55</publishTime> <publishTime>01/19/2026 15:56:05</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>01/15/2026 13:03:53</publishTime> <publishTime>01/19/2026 15:54:15</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>01/15/2026 13:03:53</publishTime> <publishTime>01/19/2026 15:54:15</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -288,22 +297,22 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>01/15/2026 12:45:29</publishTime> <publishTime>01/19/2026 15:54:21</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>01/15/2026 12:45:29</publishTime> <publishTime>01/19/2026 15:54:21</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>01/15/2026 13:04:20</publishTime> <publishTime>01/19/2026 15:58:21</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>01/15/2026 13:04:20</publishTime> <publishTime>01/19/2026 15:58:21</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>01/15/2026 13:04:38</publishTime> <publishTime>01/19/2026 15:58:30</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -507,7 +516,7 @@ <publishTime>04/21/2025 11:46:17</publishTime> </File> <File Include="Web.config"> <publishTime>01/15/2026 13:04:40</publishTime> <publishTime>01/15/2026 16:27:10</publishTime> </File> </ItemGroup> </Project> WebAPI/Service/GeTuiService.cs
New file @@ -0,0 +1,172 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; using com.igetui.api.openservice; using System.Threading.Tasks; using System.Data; using Newtonsoft.Json.Linq; using Newtonsoft.Json; using com.igetui.api.openservice.igetui.template; using com.igetui.api.openservice.igetui; namespace WebAPI.Service { public static class GeTuiService { //http的域名 // private static String HOST = "http://sdk.open.api.igexin.com/apiex.htm"; //https的域名 private static String HOST = "https://api.getui.com/apiex.htm"; // 配置为DCLOUD 中的 unipush 个推 中对应的数据 private static String APPID = "X3I10VqaROAH8C7ElIc1L5"; private static String APPKEY = "V425beWn5K65BcOYKTcXx8"; private static String MASTERSECRET = "LOXAgRbXS98NxHKUXmlJQ"; // 推送服务实例 private static IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET); // 单条消息推送 public static void PubishSingle(int HInterID) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds = new DataSet(); try { JObject NameMsgKVP = new JObject(); ds = oCN.RunProcReturn($@" select * from h_v_OA_WorkLinkBillAllList where hmainid = {HInterID} select * from Gy_UserClientIdRelation ", "h_v_OA_WorkLinkBillAllList"); NotificationTemplate template = null; if(ds.Tables[0].Rows.Count > 0) { string title = ds.Tables[0].Rows[0]["主题"].ToString(); string content = ds.Tables[0].Rows[0]["内容"].ToString(); template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList", "0"); // 广播 if(ds.Tables[0].Rows[0]["发送类型"].ToString() == "公共") { // 遍历 全推送 foreach(DataRow row in ds.Tables[1].Rows) { PushMessageToSingle(template, row["HClientID"].ToString()); } }else // 单独推送 { // 推送给接收人 和 抄送人 foreach (DataRow row in ds.Tables[1].Rows) { if(ds.Tables[0].Rows[0]["接收人"].ToString() == row["HUserName"].ToString() || ds.Tables[0].Rows[0]["抄送接收人"].ToString() == row["HUserName"].ToString()) PushMessageToSingle(template, row["HClientID"].ToString()); } } } } catch (Exception ex) { LogService.Write(ex.ToString()); return; } } // 单推 使用通知消息模型 private static void PushMessageToSingle(NotificationTemplate template, string ClientID) { IGtPush push = new IGtPush(HOST, APPKEY, MASTERSECRET); // 单推消息模型 SingleMessage message = new SingleMessage(); message.IsOffline = true; // 用户当前不在线时，是否离线存储,可选 message.OfflineExpireTime = 1000 * 3600 * 12; // 离线有效时间，单位为毫秒，可选 message.Data = template; //判断是否客户端是否wifi环境下推送，2为4G/3G/2G，1为在WIFI环境下，0为不限制环境 //message.PushNetWorkType = 1; com.igetui.api.openservice.igetui.Target target = new com.igetui.api.openservice.igetui.Target(); target.appId = APPID; target.clientId = ClientID; //target.alias = ALIAS; try { String pushResult = push.pushMessageToSingle(message, target); LogService.Write("-----------------------------------------------"); LogService.Write("-----------------------------------------------"); LogService.Write("----------------服务端返回结果：" + pushResult); } catch (RequestException e) { String requestId = e.RequestId; //发送失败后的重发 String pushResult = push.pushMessageToSingle(message, target, requestId); LogService.Write("-----------------------------------------------"); LogService.Write("-----------------------------------------------"); LogService.Write("----------------服务端返回结果：" + pushResult); } } //透传模板动作内容 public static TransmissionTemplate TransmissionTemplateDemo() { TransmissionTemplate template = new TransmissionTemplate(); template.AppId = APPID; template.AppKey = APPKEY; //应用启动类型，1：强制应用启动 2：等待应用启动 template.TransmissionType = 1; //透传内容 template.TransmissionContent = "透传内容"; //设置通知定时展示时间，结束时间与开始时间相差需大于6分钟，消息推送后，客户端将在指定时间差内展示消息（误差6分钟） // String begin = "2015-03-06 14:36:10"; // String end = "2015-03-06 14:46:20"; // template.setDuration(begin, end); return template; } //通知透传模板动作内容 public static NotificationTemplate GetNotificationTemplate(string title, string content, string pagePath, string HItemID) { NotificationTemplate template = new NotificationTemplate(); template.AppId = APPID; template.AppKey = APPKEY; //通知栏标题 template.Title = title; //通知栏内容 template.Text = content; //通知栏显示本地图片 template.Logo = "@/static/logo.png"; //通知栏显示网络图标 template.LogoURL = ""; //应用启动类型，1：强制应用启动 2：等待应用启动 template.TransmissionType = 1; //透传内容 template.TransmissionContent = ""; //接收到消息是否响铃，true：响铃 false：不响铃 template.IsRing = true; //接收到消息是否震动，true：震动 false：不震动 template.IsVibrate = true; //接收到消息是否可清除，true：可清除 false：不可清除 template.IsClearable = true; var customData = new Dictionary<string, string> { {"pagePath", pagePath}, // 示例："/pages/detail/detail" {"itemId", HItemID} // 示例："123456" }; template.TransmissionContent = JsonConvert.SerializeObject(customData); // 序列化为 JSON 字符串 template.TransmissionType = 1; // 1=点击通知后触发客户端回调（透传内容给客户端） //设置通知定时展示时间，结束时间与开始时间相差需大于6分钟，消息推送后，客户端将在指定时间差内展示消息（误差6分钟） // String begin = "2015-03-06 14:36:10"; // String end = "2015-03-06 14:46:20"; // template.setDuration(begin, end); return template; } } } WebAPI/Service/WebSocketServer.cs
File was renamed from WebAPI/WebSocketServer.cs @@ -125,12 +125,11 @@ JArray dataTableJArray = JArray.Parse(JsonConvert.SerializeObject(ds.Tables[0])); foreach (JToken row in dataTableJArray) { // 提前获取并处理行数据（避免重复访问 row["列名"]，且处理 null） string receiver = row["接收人"]?.ToString() ?? string.Empty; // 为 null 时返回空字符串 string ccUsers = row["所有抄送人"]?.ToString() ?? string.Empty; string sendType = row["发送类型"]?.ToString() ?? string.Empty; // 跳过无效数据行（三列均为空时，无需处理） // 跳过无效数据行 if (string.IsNullOrEmpty(receiver) && string.IsNullOrEmpty(ccUsers) && string.IsNullOrEmpty(sendType)) continue; @@ -161,7 +160,7 @@ { // 封装 websocket 信息 dictOne.Key.Send(new JObject{ ["Type"]="Message", ["Type"]="MessageNoRead", ["Content"]= NameMsgKVP[dictOne.Value.ToString()].ToString() }.ToString()); } @@ -208,5 +207,68 @@ } } } // 单条数据推送公开语句 public static void PushOne(int HInterID) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds = new DataSet(); try { JObject NameMsgKVP = new JObject(); ds = oCN.RunProcReturn($"select * from h_v_OA_WorkLinkBillAllList where hmainid = {HInterID}", "h_v_OA_WorkLinkBillAllList"); // 判断广播还是私发 ，统计数据 JArray dataTableJArray = JArray.Parse(JsonConvert.SerializeObject(ds.Tables[0])); foreach (JToken row in dataTableJArray) { string receiver = row["接收人"]?.ToString() ?? string.Empty; // 为 null 时返回空字符串 string ccUsers = row["抄送接收人"]?.ToString() ?? string.Empty; string sendType = row["发送类型"]?.ToString() ?? string.Empty; // 跳过无效数据行 if (string.IsNullOrEmpty(receiver) && string.IsNullOrEmpty(ccUsers) && string.IsNullOrEmpty(sendType)) continue; foreach (var dictOne in _NameConnectionDict) { string UName = dictOne.Value.Split('_')[1]; // 将接收人 抄送人 获取 广播的消息添加到消息缓存 if (string.Equals(row["接收人"].ToString(), UName) || row["抄送接收人"].ToString().Contains(UName) || string.Equals(row["发送类型"].ToString(), "公共")) { string dictOneVal = dictOne.Value.ToString(); if (NameMsgKVP[dictOneVal] == null) { NameMsgKVP[dictOneVal] = new JArray(); } var jArray = NameMsgKVP[dictOneVal] as JArray; jArray.Add(row); } } } // 根据用户ID分发到不同的客户端 foreach (var dictOne in _NameConnectionDict) { if (NameMsgKVP[dictOne.Value.ToString()] != null) { // 封装 websocket 信息 dictOne.Key.Send(new JObject { ["Type"] = "Message", ["Content"] = NameMsgKVP[dictOne.Value.ToString()].ToString() }.ToString()); } } LogService.Write("消息推送完成..."); } catch (Exception ex) { LogService.Write(ex.ToString()); return; } } } } WebAPI/WebAPI.csproj
@@ -87,6 +87,12 @@ <Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath> </Reference> <Reference Include="GetuiServerApiSDK"> <HintPath>DLL\GetuiServerApiSDK.dll</HintPath> </Reference> <Reference Include="Google.ProtocolBuffers"> <HintPath>DLL\Google.ProtocolBuffers.dll</HintPath> </Reference> <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL"> <HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath> </Reference> @@ -1186,6 +1192,7 @@ <DesignTimeSharedInput>True</DesignTimeSharedInput> <DependentUpon>Settings.settings</DependentUpon> </Compile> <Compile Include="Service\GeTuiService.cs" /> <Compile Include="Service\LuBaoSevice.cs" /> <Compile Include="Service\ProcessDal.cs" /> <Compile Include="Service\YqnDal.cs" /> @@ -1226,7 +1233,7 @@ <DependentUpon>Reference.map</DependentUpon> </Compile> <Compile Include="WebServer.cs" /> <Compile Include="WebSocketServer.cs" /> <Compile Include="Service\WebSocketServer.cs" /> </ItemGroup> <ItemGroup> <Content Include="packages.config"> WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <LastActiveSolutionConfig>Release|x86</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> WebAPI/WebServer.cs
@@ -8075,6 +8075,7 @@ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); return dal.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo); } } } sdk_dingding/TopSdk/bin/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -5,7 +5,7 @@ D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ
