From d0d6ab23709780d8f9a8b3eac1912057bd120b9c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 10 十月 2024 09:23:54 +0800
Subject: [PATCH] 考勤汇报单，出战汇报单pda网页自动审核
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42 ++++++++++----------
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 9 ++++
WebAPI/Controllers/条码管理/WEBSController.cs | 10 ++++
WebAPI/Web.config | 8 ++--
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 4 ++
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
10 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index a3d7835..44ee0f8 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/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";
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 969456c..9d1b57f 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/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)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 3553906..4521752 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/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; //鎴愬姛锛�
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 70c86d5..6ee3a96 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/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; //鎴愬姛锛�
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index deb6b0e..f621384 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/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>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index ad764f1..319b778 100644
--- a/WebAPI/Web.config
+++ b/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>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index dd7dd71..fbf53fe 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 93c03a7..44a7cd0 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index dd7dd71..fbf53fe 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 93c03a7..44a7cd0 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1