新增 设备运行报表 时序图 异常反馈根据设备ID获取数据 返回检验方案单列表 分页 API

chenhaozhe

2026-04-09 6321b72127c036bd9e1140fe5a1ae03e5aed569c

新增 设备运行报表 时序图 异常反馈根据设备ID获取数据 返回检验方案单列表 分页 API

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_BillType.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -14,3 +14,4 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

 WebAPI/Controllers/QC_ManagementController.cs

@@ -108,6 +108,51 @@
        /// <returns></returns>
        [Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
        [HttpGet]
        public object MES_QC_CheckProjectList_Json_Main2(string sWhere, string user, int page = -1, int size = -1)
        {
            if(page == -1 || size == -1)
            {
                return MES_QC_CheckProjectList_Json_Main(sWhere, user);
            }
            DataSet ds;
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn($@"select  * from h_v_Gy_QCCheckProjectList_Main  order by 日期 desc,单据号 DESC 
                    offset {(page-1)*size} rows fetch {size} rows only
                    ", "h_v_Gy_QCCheckProjectList_Main");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
                    string sql = sql1 + sWhere + $" order by 日期 desc,单据号 DESC offset {(page-1)*size} rows fetch {size} rows only ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }


        public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
        {
            DataSet ds;

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -1389,6 +1389,64 @@
        }
        #endregion

        #region 设备运行报表 时序图
        [Route("SB_EquipRunningStatus/ReportByID")]
        [HttpGet]
        public object ReportByID(string HEquipID, string user, string sWhere)
        {
            try
            {
               List<object> columnNameList = new List<object>();
              
               
                string sql = $"select * from h_v_Gy_EquipmentCockpit_Gantt where HEquipID = {HEquipID} ";
                if(!string.IsNullOrWhiteSpace(sWhere))
                {
                    sql += sWhere;
                }
                sql += "order by StartTime desc";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipmentCockpit_Gantt");
               

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;

                //if (ds.Tables[0].Rows.Count != 0 && ds != null)
                //{

                //}
                //else
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无数据";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 设备运行状态报表

        [Route("SB_EquipRunningStatus/Report")]

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -1728,14 +1728,19 @@
                //保存
                //保存完毕后处理
                bool bResult = false;
                string RetHInterID = "0";
                if (oBill.omodel.HInterID == 0)
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                    if(bResult)
                    {
                        RetHInterID = DBUtility.ClsPub.sExeReturnInfo;
                    }
                }
                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
                if (ds.Tables[0].Rows.Count == 0)
                // ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain nolock where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
                //if (ds.Tables[0].Rows.Count == 0)
                if(RetHInterID == "0")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
@@ -1744,12 +1749,11 @@
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

                string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
                if (sAutoCheck == "Y")
                {

                    if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
                    if (!oBill.CheckBill(long.Parse(RetHInterID), ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -1007,6 +1007,33 @@
        }
        #endregion

        #region 异常反馈根据设备ID获取数据
        [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListByHEquipID")]
        [HttpGet]
        public ApiResult<DataSet> Get_TransFerBillListByHEquipID(string HEquipID, string sWhere)
        {
            if (string.IsNullOrEmpty(HEquipID))
                return new ApiResult<DataSet> { code = -1, msg = "设备不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            string sql = string.Format($@"
                select c.HNumber 警报代码,CONVERT(VARCHAR(255), ABS(DATEDIFF(HOUR, a.HMakeDate, a.HUpdateDate))) + '小时' 持续时间,a.HErrLev 原因, a.HDate 时间 from h_v_OA_ErrMsgBackBillEdit a
                left join Gy_EquipFileBillMain b on a.HSourceID = b.HSourceID
                left join Gy_ErrMsgBackType c on c.HItemID = a.HErrMsgBackTypeID  
                where b.HInterID = {HEquipID}
            ");

            if (!string.IsNullOrEmpty(sWhere))
            {
                sql += sWhere;
            }
            var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
            if (dataSet == null)
                return new ApiResult<DataSet> { code = -1, msg = "当前设备对应的警报记录不存在" };

            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

        #region 异常反馈列表编辑获取数据
        [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetai")]
        [HttpGet]

 WebAPI/Properties/PublishProfiles/CHZFolderProfile.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-04-07T08:38:07.0366622Z;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
    <History>True|2026-04-09T02:49:39.1474349Z;False|2026-04-09T10:48:56.4483129+08:00;True|2026-04-08T15:52:56.0654175+08:00;True|2026-04-08T15:51:48.5362330+08:00;True|2026-04-08T15:38:55.9430240+08:00;True|2026-04-08T14:28:05.8170952+08:00;True|2026-04-08T10:04:26.1290532+08:00;True|2026-04-08T09:54:42.7091796+08:00;True|2026-04-08T09:47:39.4265409+08:00;True|2026-04-08T09:31:33.9940810+08:00;True|2026-04-08T09:25:48.8335042+08:00;True|2026-04-08T09:18:49.2340416+08:00;True|2026-04-08T09:05:38.1946058+08:00;True|2026-04-08T08:51:42.9648664+08:00;False|2026-04-08T08:50:29.4049907+08:00;True|2026-04-07T16:38:07.0366622+08:00;True|2026-04-07T16:30:02.5849908+08:00;True|2026-04-07T10:34:01.7729330+08:00;True|2026-04-07T09:48:28.6594815+08:00;True|2026-04-07T08:27:08.5467426+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>04/03/2026 09:16:39</publishTime>
      <publishTime>04/08/2026 08:51:06</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>04/03/2026 09:16:39</publishTime>
      <publishTime>04/08/2026 08:51:06</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>04/03/2026 09:16:36</publishTime>
      <publishTime>04/08/2026 08:51:02</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>04/03/2026 09:16:36</publishTime>
      <publishTime>04/08/2026 08:51:02</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>03/30/2026 15:31:51</publishTime>
      <publishTime>04/08/2026 08:50:54</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>03/30/2026 15:31:51</publishTime>
      <publishTime>04/08/2026 08:50:54</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -150,10 +150,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>04/01/2026 16:50:57</publishTime>
      <publishTime>04/08/2026 08:50:56</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>04/01/2026 16:50:57</publishTime>
      <publishTime>04/08/2026 08:50:56</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -189,34 +189,34 @@
      <publishTime>11/13/2012 20:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>03/30/2026 15:31:48</publishTime>
      <publishTime>04/08/2026 08:50:51</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>03/30/2026 15:31:48</publishTime>
      <publishTime>04/08/2026 08:50:51</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>03/30/2026 15:31:50</publishTime>
      <publishTime>04/08/2026 08:50:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>03/30/2026 15:31:50</publishTime>
      <publishTime>04/08/2026 08:50:52</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>03/30/2026 15:31:50</publishTime>
      <publishTime>04/08/2026 08:50:53</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>03/30/2026 15:31:50</publishTime>
      <publishTime>04/08/2026 08:50:53</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>03/30/2026 15:31:46</publishTime>
      <publishTime>04/08/2026 08:42:16</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>03/30/2026 15:31:46</publishTime>
      <publishTime>04/08/2026 08:42:16</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -330,22 +330,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>03/30/2026 15:31:53</publishTime>
      <publishTime>04/08/2026 08:42:16</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>03/30/2026 15:31:53</publishTime>
      <publishTime>04/08/2026 08:42:16</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/07/2026 16:37:44</publishTime>
      <publishTime>04/09/2026 10:49:21</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/07/2026 16:37:44</publishTime>
      <publishTime>04/09/2026 10:49:21</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>04/07/2026 16:38:03</publishTime>
      <publishTime>04/09/2026 10:49:35</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 WebAPI/WebAPI.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -12,7 +12,7 @@
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ