wtt
2024-10-10 d0d6ab23709780d8f9a8b3eac1912057bd120b9c
考勤汇报单,出战汇报单pda网页自动审核
10个文件已修改
75 ■■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 8 ●●●● 补丁 | 查看 | 原始文档 | 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/CJGL/Cj_StationOutBillController.cs
@@ -604,6 +604,10 @@
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸
                    {
                        object objResult = set_CheckBill(HInterID.ToString(), user, HBillSubType);
                    }
                    if (oSystemParameter.omodel.MES_StationOutBill_SaveAutoAddnew == "Y") //系统参数  é¡µé¢ä¿å­˜è‡ªåŠ¨å˜æˆæ–°å¢žçŠ¶æ€
                    {
                        objJsonResult.Verify = "Y";
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -494,7 +494,7 @@
                    //计价方式不为计时,则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
                    {
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = null where HInterID = " + HInterID + " and HEntryID = " + i);
                        oCN.RunProc("update Gy_RoutingBillSub set HEstimate = 0 where HInterID = " + HInterID + " and HEntryID = " + i);
                    }
                    if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs
@@ -14,6 +14,7 @@
    public class Pay_WorkTimesBillController : ApiController
    {
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();//系统变量
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        public const string ModName = "2203";                   //单据类型
        public const string ModCaption = "考勤汇报单";          //单据名称
@@ -748,6 +749,14 @@
                if (bResult)
                {
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸
                        {
                            object objResult = GetPay_WorkTimesBill_Check_Json(lsmain[0].HInterID,1, HMaker);
                        }
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;  //成功!
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -16,7 +16,6 @@
using WebAPI;
using WebAPI.Models;
using WebAPI.Service;
namespace WebAPI.Controllers
{
    public class WEBSController : ApiController
@@ -1897,6 +1896,15 @@
                if (oWebs.set_SaveICMOReportBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
                {
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸
                        {
                            Cj_StationOutBillController cj_StationOutBillController = new Cj_StationOutBillController();
                            object objResult = cj_StationOutBillController.set_CheckBill(lsmain[0].HInterID.ToString(), lsmain[0].HMaker, "3791");
                        }
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功!
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/08/2024 17:47:54</publishTime>
      <publishTime>10/09/2024 18:44:01</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/08/2024 17:47:54</publishTime>
      <publishTime>10/09/2024 18:44:01</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/08/2024 17:47:52</publishTime>
      <publishTime>10/09/2024 18:43:59</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/08/2024 17:47:52</publishTime>
      <publishTime>10/09/2024 18:43:59</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/08/2024 17:47:40</publishTime>
      <publishTime>10/09/2024 18:43:53</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/08/2024 17:47:40</publishTime>
      <publishTime>10/09/2024 18:43:53</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/08/2024 17:47:42</publishTime>
      <publishTime>10/09/2024 18:43:55</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/08/2024 17:47:42</publishTime>
      <publishTime>10/09/2024 18:43:55</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/08/2024 17:47:35</publishTime>
      <publishTime>10/09/2024 18:43:50</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/08/2024 17:47:35</publishTime>
      <publishTime>10/09/2024 18:43:50</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/08/2024 17:47:37</publishTime>
      <publishTime>10/09/2024 18:43:51</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/08/2024 17:47:37</publishTime>
      <publishTime>10/09/2024 18:43:51</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/08/2024 17:47:38</publishTime>
      <publishTime>10/09/2024 18:43:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/08/2024 17:47:38</publishTime>
      <publishTime>10/09/2024 18:43:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/08/2024 17:43:31</publishTime>
      <publishTime>10/09/2024 18:40:56</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/08/2024 17:43:31</publishTime>
      <publishTime>10/09/2024 18:40:56</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/08/2024 17:43:36</publishTime>
      <publishTime>10/09/2024 18:41:03</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/08/2024 17:43:36</publishTime>
      <publishTime>10/09/2024 18:41:03</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/08/2024 17:48:35</publishTime>
      <publishTime>10/09/2024 18:44:33</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/08/2024 17:48:35</publishTime>
      <publishTime>10/09/2024 18:44:33</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/08/2024 17:48:35</publishTime>
      <publishTime>10/09/2024 15:06:19</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Web.config
@@ -22,7 +22,7 @@
        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />    <!--颜台式机-->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />-->    <!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -35,7 +35,7 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />-->    <!--翁涛涛本地配置-->
        <add key="surl" value="http://localhost/webs-web/webservice1.asmx" />    <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        
@@ -106,13 +106,13 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>
    <applicationSettings>
        <WebAPI.Properties.Settings>
            <setting name="WebAPI_WebS_WebService1" serializeAs="String">
                <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
                <value>http://localhost/webs-web/webservice1.asmx</value>
            </setting>
        </WebAPI.Properties.Settings>
    </applicationSettings>
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