From d8fc6ac36336cb02a00f1e5f4e90b7bdfb34fb85 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 十月 2024 11:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Models/StationBill.cs | 1 +
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 40 ++++++++++++++++++++--------------------
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 3 ++-
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
7 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index d15cceb..a3d7835 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -77,6 +77,7 @@
long HMainInterID = 0;
HMainInterID = list[0].HMainInterID;
string eventType = list[0].eventType;
+ string HDate = list[0].HDate;
string BillType = "3791";
string HBillSubType = "3791";
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -408,7 +409,7 @@
",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
",HToCheckQty,HLossQty,HBackWorkByMaterQty,HMouldID" +
") " +
- " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
+ " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",'"+ HDate + "','" + HMaker + "',getdate(),'" + HMouldNum + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index 2061bf9..b7f91d3 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -92,5 +92,6 @@
public long HMaterToSourceInterID { get; set; }
public string HMaterToSourceBillNo { get; set; }
public int HMouldID { get; set; }
+ public string HDate { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 8a1c829..1a97853 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/05/2024 11:17:39</publishTime>
+ <publishTime>10/07/2024 11:20:11</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/05/2024 11:17:39</publishTime>
+ <publishTime>10/07/2024 11:20:11</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 11:17:36</publishTime>
+ <publishTime>10/07/2024 11:20:07</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/05/2024 11:17:36</publishTime>
+ <publishTime>10/07/2024 11:20:07</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 11:17:30</publishTime>
+ <publishTime>10/07/2024 11:20:00</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/05/2024 11:17:30</publishTime>
+ <publishTime>10/07/2024 11:20:00</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 11:17:31</publishTime>
+ <publishTime>10/07/2024 11:20:01</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/05/2024 11:17:31</publishTime>
+ <publishTime>10/07/2024 11:20:01</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 11:17:27</publishTime>
+ <publishTime>10/07/2024 11:19:56</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/05/2024 11:17:27</publishTime>
+ <publishTime>10/07/2024 11:19:56</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/05/2024 11:17:28</publishTime>
+ <publishTime>10/07/2024 11:19:57</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/05/2024 11:17:28</publishTime>
+ <publishTime>10/07/2024 11:19:57</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 11:17:28</publishTime>
+ <publishTime>10/07/2024 11:19:58</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/05/2024 11:17:28</publishTime>
+ <publishTime>10/07/2024 11:19:58</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 11:14:06</publishTime>
+ <publishTime>10/07/2024 11:17:43</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>10/05/2024 11:14:06</publishTime>
+ <publishTime>10/07/2024 11:17:43</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 11:14:13</publishTime>
+ <publishTime>10/07/2024 11:17:51</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>10/05/2024 11:14:13</publishTime>
+ <publishTime>10/07/2024 11:17:51</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 11:18:12</publishTime>
+ <publishTime>10/07/2024 11:20:57</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/05/2024 11:18:12</publishTime>
+ <publishTime>10/07/2024 11:20:57</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index a156a5e..62ea6f5 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 441c553..ca7588a 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 a156a5e..62ea6f5 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 441c553..ca7588a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1