1
zrg
2024-08-28 5019f047cf39e37052b5953b515a142cd67b7d0e
1
7个文件已修改
1个文件已添加
128 ■■■■ 已修改文件
WebAPI/Controllers/SCGL/Sc_ProductionReportsController.cs 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | 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/SCGL/Sc_ProductionReportsController.cs
New file
@@ -0,0 +1,83 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class Sc_ProductionReportsController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        private json objJsonResultReturn = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        DataSet ds;
        #region 生产模块 计划达成率报表
        /// <summary>
        /// 返回计划达成率报表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Sc_ProductionReport/PlanAchievementRate")]
        [HttpGet]
        public object PlanAchievementRate(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询条件!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();
                int HDeptID = int.Parse(dic["HDeptID"].ToString());
                string HSourceName = dic["HSourceName"].ToString();
                string HMaterNumber = dic["HMaterNumber"].ToString();
                string HMaterName = dic["HMaterName"].ToString();
                string HMaterModel = dic["HMaterModel"].ToString();
                string HCustomize = dic["HCustomize"].ToString();
                ds = oCN.RunProcReturn("exec h_p_Sc_PlanAchievementRateReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HSourceName + "','" + HMaterNumber + "','" + HMaterName + "','" + HMaterModel + "','" + HCustomize + "'", "h_p_Sc_PlanAchievementRateReport");
                //添加列名
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Properties/PublishProfiles/JFAPI.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|2024-08-22T03:12:48.4249984Z;</History>
    <History>True|2024-08-26T06:17:37.8502046Z;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/22/2024 11:06:06</publishTime>
      <publishTime>08/26/2024 14:16:33</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/22/2024 11:06:06</publishTime>
      <publishTime>08/26/2024 14:16:33</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/17/2020 21:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/22/2024 11:06:03</publishTime>
      <publishTime>08/26/2024 14:16:32</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/22/2024 11:06:03</publishTime>
      <publishTime>08/26/2024 14:16:32</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/22/2024 11:05:59</publishTime>
      <publishTime>08/26/2024 14:16:30</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/22/2024 11:05:59</publishTime>
      <publishTime>08/26/2024 14:16:30</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 05:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/22/2024 11:06:00</publishTime>
      <publishTime>08/26/2024 14:16:30</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/22/2024 11:06:00</publishTime>
      <publishTime>08/26/2024 14:16:30</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>09/05/2022 17:03:10</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/22/2024 11:05:56</publishTime>
      <publishTime>08/26/2024 14:16:28</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/22/2024 11:05:56</publishTime>
      <publishTime>08/26/2024 14:16:28</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/22/2024 11:05:57</publishTime>
      <publishTime>08/26/2024 14:16:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/22/2024 11:05:57</publishTime>
      <publishTime>08/26/2024 14:16:29</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/30/2012 22:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/22/2024 11:05:58</publishTime>
      <publishTime>08/26/2024 14:16:29</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/22/2024 11:05:58</publishTime>
      <publishTime>08/26/2024 14:16:29</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 02:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/22/2024 11:05:59</publishTime>
      <publishTime>08/26/2024 14:16:31</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/22/2024 11:05:59</publishTime>
      <publishTime>08/26/2024 14:16:31</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/22/2024 11:06:14</publishTime>
      <publishTime>08/26/2024 14:16:37</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/22/2024 11:06:14</publishTime>
      <publishTime>08/26/2024 14:16:37</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -486,7 +486,7 @@
      <publishTime>05/06/2024 08:56:50</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/22/2024 11:12:47</publishTime>
      <publishTime>08/26/2024 14:17:36</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -436,6 +436,7 @@
    <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
    <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
    <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
    <Compile Include="Controllers\仓存管理\Kf_MoveStockBillController.cs" />
    <Compile Include="Controllers\品质管理\质量月度目标单\QC_MonthTarGetBillController.cs" />
    <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
WebAPI/WebAPI.csproj.user
@@ -19,8 +19,8 @@
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
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