智云MES后端API代码
parent: c42507ed | 补丁 | 提交 | ignore whitespace
1
zrg
2024-10-31 4323f1810ee94959d7f2b6b8c7a120bd510b36ca 
1
8个文件已修改
50 ■■■■■ 已修改文件
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史 
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt


@@ -14,5 +14,8 @@


D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache


D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll


D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache


<<<<<<< HEAD


D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache


=======


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache


>>>>>>> df8354d552a8658d5919d801ad307489c039eb02




 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs


@@ -1567,7 +1567,7 @@


                    " LEFT JOIN Gy_RoutingBillMain as po ON a.hmainid = po.HInterID" +


                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +


                    " LEFT JOIN Xt_CheckUserRight as cr ON cr.HCheckItemID = i.HItemID and cr.HCheckFlowInterID = m.HInterID" +


                    " where po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";


                    " where 工序代码 != '9999' and a.HBillSubType<>'SUB' and po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID  and cr.HUserID = '" + userid + "'";


                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


@@ -1617,7 +1617,7 @@


                string sql = "  select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as 审批流,c.HCheckFlowID,i.HName as 审批项目名称,c.HCheckItemID,c.HChecker as 项目审核人,c.HCheckNote as 审批流审核建议,c.HCheckDate 审批流审核日期   from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.单据类型 = c.HBillTypeID" +


                    " LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +


                    " LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +


                    " where c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";


                    " where 工序代码 != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is  not NUll and c.HChecker = '" + user + "'";


                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");


                foreach (DataColumn col in ds.Tables[0].Columns)


                {




 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/29/2024 11:25:50</publishTime>


      <publishTime>10/30/2024 15:32:44</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>10/29/2024 11:25:50</publishTime>


      <publishTime>10/30/2024 15:32:44</publishTime>


    </File>


    <File Include="bin/BouncyCastle.Crypto.dll">


      <publishTime>12/18/2020 05:32:28</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>10/29/2024 11:25:46</publishTime>


      <publishTime>10/30/2024 15:32:42</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>10/29/2024 11:25:46</publishTime>


      <publishTime>10/30/2024 15:32:42</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 22:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>10/29/2024 11:25:36</publishTime>


      <publishTime>10/30/2024 15:32:35</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>10/29/2024 11:25:36</publishTime>


      <publishTime>10/30/2024 15:32:35</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/29/2024 11:25:39</publishTime>


      <publishTime>10/30/2024 15:32:37</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>10/29/2024 11:25:39</publishTime>


      <publishTime>10/30/2024 15:32:37</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/29/2024 11:25:33</publishTime>


      <publishTime>10/30/2024 15:32:33</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>10/29/2024 11:25:33</publishTime>


      <publishTime>10/30/2024 15:32:33</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>10/29/2024 11:25:34</publishTime>


      <publishTime>10/30/2024 15:32:34</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>10/29/2024 11:25:34</publishTime>


      <publishTime>10/30/2024 15:32:34</publishTime>


    </File>


    <File Include="bin/RestSharp.dll">


      <publishTime>08/31/2012 06:22:50</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>10/29/2024 11:25:35</publishTime>


      <publishTime>10/30/2024 15:32:34</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>10/29/2024 11:25:35</publishTime>


      <publishTime>10/30/2024 15:32:34</publishTime>


    </File>


    <File Include="bin/Swashbuckle.Core.dll">


      <publishTime>02/16/2015 01:57:08</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.dll">


      <publishTime>10/29/2024 11:23:21</publishTime>


      <publishTime>10/30/2024 15:30:45</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.pdb">


      <publishTime>10/29/2024 11:23:21</publishTime>


      <publishTime>10/30/2024 15:30:45</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/29/2024 11:23:27</publishTime>


      <publishTime>10/30/2024 15:30:51</publishTime>


    </File>


    <File Include="bin/TopSdk.pdb">


      <publishTime>10/29/2024 11:23:27</publishTime>


      <publishTime>10/30/2024 15:30:51</publishTime>


    </File>


    <File Include="bin/WebActivatorEx.dll">


      <publishTime>11/24/2014 19:18:48</publishTime>


    </File>


    <File Include="bin/WebAPI.dll">


      <publishTime>10/29/2024 11:26:23</publishTime>


      <publishTime>10/30/2024 15:33:22</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>10/29/2024 11:26:23</publishTime>


      <publishTime>10/30/2024 15:33:22</publishTime>


    </File>


    <File Include="bin/WebAPI.XmlSerializers.dll">


      <publishTime>08/16/2024 16:55:28</publishTime>




 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


@@ -20,5 +20,4 @@


D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll


D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb


D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache


C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache


D:\智云迈思\MES\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