yusijie
2024-10-05 8dcf633e93e5dbb859b456dd9a2d274e5cfc5a56
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
8个文件已修改
102 ■■■■ 已修改文件
WebAPI/Controllers/WebAPIController.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs
@@ -14722,6 +14722,61 @@
                return objjson;
            }
        }
        #region 条码主档分页列表
        [Route("Gy_BarCodeBillList/page")]
        [HttpGet]
        public json Gy_BarCodeBillListPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            json res = new json();
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",''", "h_p_IF_BarCodeBillList");
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_IF_BarCodeBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_BarCodeBillList");
                }
                //添加列名
                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列对象的列名
                }
                res.code = CodeConstant.SUCCEED;
                res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                res.Message = "Sucess!";
                res.list = columnNameList;
                res.data = ds.Tables[0];
                return res;
            }
            catch (Exception e)
            {
                res.code = CodeConstant.FAIL;
                res.count = CountConstant.FAIL;
                res.Message = "Exception!" + e.ToString();
                res.data = null;
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// 根据设备保养规程显示设备保养规程项目
        /// </summary>
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/04/2024 18:32:29</publishTime>
      <publishTime>10/05/2024 08:12:04</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/04/2024 18:32:29</publishTime>
      <publishTime>10/05/2024 08:12:04</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/04/2024 18:32:27</publishTime>
      <publishTime>10/05/2024 08:12:02</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/04/2024 18:32:27</publishTime>
      <publishTime>10/05/2024 08:12:02</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/04/2024 18:32:21</publishTime>
      <publishTime>10/05/2024 08:11:56</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/04/2024 18:32:21</publishTime>
      <publishTime>10/05/2024 08:11:56</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>10/04/2024 18:32:22</publishTime>
      <publishTime>10/05/2024 08:11:58</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/04/2024 18:32:22</publishTime>
      <publishTime>10/05/2024 08:11:58</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/04/2024 18:32:19</publishTime>
      <publishTime>10/05/2024 08:11:55</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/04/2024 18:32:19</publishTime>
      <publishTime>10/05/2024 08:11:55</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/04/2024 18:32:20</publishTime>
      <publishTime>10/05/2024 08:11:55</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/04/2024 18:32:20</publishTime>
      <publishTime>10/05/2024 08:11:55</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/04/2024 18:32:20</publishTime>
      <publishTime>10/05/2024 08:11:56</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/04/2024 18:32:20</publishTime>
      <publishTime>10/05/2024 08:11:56</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/04/2024 18:30:22</publishTime>
      <publishTime>10/05/2024 08:09:30</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/04/2024 18:30:22</publishTime>
      <publishTime>10/05/2024 08:09:30</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/04/2024 18:30:31</publishTime>
      <publishTime>10/05/2024 08:09:37</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/04/2024 18:30:31</publishTime>
      <publishTime>10/05/2024 08:09:37</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/04/2024 18:33:02</publishTime>
      <publishTime>10/05/2024 08:12:33</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/04/2024 18:33:02</publishTime>
      <publishTime>10/05/2024 08:12:33</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
WebAPI/WebAPI.csproj
@@ -799,6 +799,8 @@
    <Compile Include="DLL\工资管理\ClsPay_WorkTimesBill.cs" />
    <Compile Include="DLL\钉钉消息\Cls_DDMsg.cs" />
    <Compile Include="DLL\项目管理\项目阶段\ClsPM_CustomerProInfoBill_Ctl.cs" />
    <Compile Include="Exceptions\EmptyException.cs" />
    <Compile Include="Exceptions\ExcelException.cs" />
    <Compile Include="HttpClient.cs" />
    <Compile Include="InvokeHelper.cs" />
    <Compile Include="Log.cs" />
WebAPI/WebAPI.csproj.user
@@ -10,8 +10,7 @@
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -19,7 +18,7 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
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.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ