1

wtt

2024-08-22 58664e903be19c187a2cd2d620bff479086da137

1

 WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -68,8 +69,41 @@
            }
        }

        #region 车间管理  热处理温度曲线图
        [Route("Cj_NoPassProc/HeatTreatmentTemperatureCurveChart")]
        [HttpGet]
        public object HeatTreatmentTemperatureCurveChart(string sWhere,string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '"+ sWhere + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");

        //
                //添加列名
                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 = "";
                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/Controllers/CJGL/Cj_SingleStationController.cs

@@ -2073,5 +2073,85 @@
        }
        #endregion

        #region 工序单品过站 单品过站查询
        [Route("Cj_SingleStation/SingleItemTransitList")]
        [HttpGet]
        public object SingleItemTransitList(string HProcExchBillNo, string user)
        {
            try
            {

                List<object> columnNameList = new List<object>();

                string sql = @"exec h_p_SingleItemTransitList '" + HProcExchBillNo + "'";
                ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransitList");

                //添加列名
                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)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 工序单品过站 单品过站查询 查询具体条码
        [Route("Cj_SingleStation/SingleItemTransit_SN_List")]
        [HttpGet]
        public object SingleItemTransit_SN_List(string sWhere, string TableName)
        {
            try
            {

                List<object> columnNameList = new List<object>();

                string sql = @"exec h_p_SingleItemTransit_SN_List '" + sWhere + "','"+ TableName + "'";
                ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransit_SN_List");

                //添加列名
                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)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user

@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-08-21T08:09:41.0487181Z;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <History>True|2024-08-22T01:48:50.0760398Z;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/19/2024 08:51:07</publishTime>
      <publishTime>08/22/2024 09:36:27</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/19/2024 08:51:07</publishTime>
      <publishTime>08/22/2024 09:36:27</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/19/2024 08:50:56</publishTime>
      <publishTime>08/22/2024 09:36:26</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/19/2024 08:50:56</publishTime>
      <publishTime>08/22/2024 09:36:26</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/19/2024 08:50:48</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/19/2024 08:50:48</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>02/08/2023 09:47:46</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/19/2024 08:50:49</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/19/2024 08:50:49</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/19/2024 08:50:45</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/19/2024 08:50:45</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/19/2024 08:50:46</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/19/2024 08:50:46</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/19/2024 08:50:47</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/19/2024 08:50:47</publishTime>
      <publishTime>08/22/2024 09:36:23</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,7 +246,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/21/2024 16:07:09</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/21/2024 16:07:09</publishTime>
      <publishTime>08/22/2024 09:36:24</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/21/2024 16:09:38</publishTime>
      <publishTime>08/22/2024 09:36:30</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/21/2024 16:09:38</publishTime>
      <publishTime>08/22/2024 09:36:30</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -303,58 +303,58 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>08/15/2022 15:46:13</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>02/08/2023 09:47:46</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -372,121 +372,121 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/12/2023 08:14:21</publishTime>
      <publishTime>07/18/2023 17:26:29</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/12/2024 15:14:33</publishTime>
      <publishTime>08/15/2024 22:14:00</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:09</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>03/31/2023 09:57:08</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/06/2024 13:47:57</publishTime>
      <publishTime>05/13/2024 10:26:00</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/21/2024 14:50:10</publishTime>
      <publishTime>08/22/2024 09:48:49</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml

File was deleted

 WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user

File was deleted

 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.AssemblyReference.cache

Binary files differ

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

@@ -27,4 +27,13 @@
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
<<<<<<< HEAD
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
>>>>>>> 5c681da4317f7267921689c0015a89d07dffdc23
>>>>>>> d63bbcbae24d318011ac68cef3955fbaf88c4274

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ