智云MES后端API代码
parent: 4542d25b | 补丁 | 提交 | ignore whitespace
wtt
2024-10-05 8bae9699d6fa35e2ecc1b871e45b6d6d9cbe01f3 
工艺路线多级审批反审核控制添加
2个文件已添加
8个文件已修改
76 ■■■■■ 已修改文件
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | 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.AssemblyReference.cache 补丁 | 查看 | 原始文档 | 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.AssemblyReference.cache

Binary files differ



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


@@ -14,3 +14,4 @@


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


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


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


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




 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs


@@ -1976,23 +1976,23 @@


                {


                    #region 反审核前的相关判断


                    //反审核前控制=========================================


                    //DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_Routing_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Gy_Routing_BeforeUnCheckCtrl");


                    //if (ds == null)


                    //{


                    //    objJsonResult.code = CodeConstant.FAIL;


                    //    objJsonResult.count = CountConstant.FAIL;


                    //    objJsonResult.Message = "反审核失败!原因:" + "反审核前判断失败！";


                    //    objJsonResult.data = null;


                    //    return objJsonResult;


                    //}


                    //if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")


                    //{


                    //    objJsonResult.code = CodeConstant.FAIL;


                    //    objJsonResult.count = CountConstant.FAIL;


                    //    objJsonResult.Message = "反审核失败!原因:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);


                    //    objJsonResult.data = null;


                    //    return objJsonResult;


                    //}


                    DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_Routing_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Gy_Routing_BeforeUnCheckCtrl");


                    if (ds == null)


                    {


                        objJsonResult.code = CodeConstant.FAIL;


                        objJsonResult.count = CountConstant.FAIL;


                        objJsonResult.Message = "反审核失败!原因:" + "反审核前判断失败！";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")


                    {


                        objJsonResult.code = CodeConstant.FAIL;


                        objJsonResult.count = CountConstant.FAIL;


                        objJsonResult.Message = "反审核失败!原因:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


                    //=========================================================




                    //进行 会计期间 结账 的判断和控制




 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/05/2024 08:12:04</publishTime>


      <publishTime>10/05/2024 11:17:39</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:12:04</publishTime>


      <publishTime>10/05/2024 11:17:39</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>10/05/2024 08:12:02</publishTime>


      <publishTime>10/05/2024 11:17:36</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:12:02</publishTime>


      <publishTime>10/05/2024 11:17:36</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>10/05/2024 08:11:56</publishTime>


      <publishTime>10/05/2024 11:17:30</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:56</publishTime>


      <publishTime>10/05/2024 11:17:30</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/05/2024 08:11:58</publishTime>


      <publishTime>10/05/2024 11:17:31</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:58</publishTime>


      <publishTime>10/05/2024 11:17:31</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/05/2024 08:11:55</publishTime>


      <publishTime>10/05/2024 11:17:27</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:55</publishTime>


      <publishTime>10/05/2024 11:17:27</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:55</publishTime>


      <publishTime>10/05/2024 11:17:28</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:55</publishTime>


      <publishTime>10/05/2024 11:17:28</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>10/05/2024 08:11:56</publishTime>


      <publishTime>10/05/2024 11:17:28</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:11:56</publishTime>


      <publishTime>10/05/2024 11:17:28</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>10/05/2024 08:09:30</publishTime>


      <publishTime>10/05/2024 11:14:06</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:09:30</publishTime>


      <publishTime>10/05/2024 11:14:06</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/05/2024 08:09:37</publishTime>


      <publishTime>10/05/2024 11:14:13</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:09:37</publishTime>


      <publishTime>10/05/2024 11:14:13</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>10/05/2024 08:12:33</publishTime>


      <publishTime>10/05/2024 11:18:12</publishTime>


    </File>


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


      <publishTime>10/05/2024 08:12:33</publishTime>


      <publishTime>10/05/2024 11:18:12</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.AssemblyReference.cache

Binary files differ



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


@@ -15,3 +15,4 @@


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


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


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


C:\Users\86130\Desktop\智云迈思\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