From 052bd75fc5da2ed0d51f80e0b25031c250cdf949 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:20:03 +0800
Subject: [PATCH] 1
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
/dev/null | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42 ++++++++++----------
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 38 -------------------
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs | 1
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 5 +-
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
9 files changed, 25 insertions(+), 61 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 4878209..db8a236 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -251,6 +251,7 @@
BillNew.HSourceInterID = mainList[0].HICMOInterID;
BillNew.HSourceBillType = mainList[0].HSourceBillType;
BillNew.HBadReasonHQty = mainList[0].HBadReasonHQty;
+ BillNew.HQty = DBUtility.ClsPub.isLong(mainList[0].HQty);
oCN.BeginTran();
//涓存椂琛�
oCN.RunProc("Insert Into Sc_ICMOBillQualityStatus_Tmp " +
@@ -258,13 +259,13 @@
",HProcExchBillNo,HProcExchInterID,HProcExchEntryID,HProcID,HMaterID" +
",HSourceID,HGroupID,HDeptID,HCheckManID,HBadReasonID,HBarCode" +
",HMaker,HMakeDate,HBillType,HReportType,HSourceBillNo" +
- ",HSourceInterID,HSourceBillType,HICMOEntryID,HSourceEntryID,HBadReasonHQty" +
+ ",HSourceInterID,HSourceBillType,HICMOEntryID,HSourceEntryID,HBadReasonHQty,HQty" +
") " +
" values(" + BillNew.HInterID + ",'" + BillNew.HBillNo + "','" + BillNew.HDate + "','" + BillNew.HICMOBillNo + "'," + BillNew.HICMOInterID +
",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
"," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HDeptID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
- "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty +
+ "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
") ");
sReturn = "鎵爜鎴愬姛锛�";
oCN.Commit();
diff --git a/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
index e060d78..fa46ed5 100644
--- a/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
+++ b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
@@ -50,6 +50,7 @@
public string HRelationBillNo { get; set; }//鍏宠仈鍗曞彿
public long HReportEntryID { get; set; }//姹囨姤鍗曞瓙鍐呯爜
public long HBadReasonHQty { get; set; }//涓嶈壇鏁伴噺 鏂帿灏�
+ public long HQty { get; set; }//妫�楠屾暟閲�
public long HDeptID { get; set; }//閮ㄩ棬
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index cba7ea2..6cd6f08 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>12/23/2025 17:02:56</publishTime>
+ <publishTime>12/24/2025 14:54:28</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/23/2025 17:02:56</publishTime>
+ <publishTime>12/24/2025 14:54:28</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/23/2025 17:02:51</publishTime>
+ <publishTime>12/24/2025 14:54:25</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/23/2025 17:02:51</publishTime>
+ <publishTime>12/24/2025 14:54:25</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/23/2025 17:02:46</publishTime>
+ <publishTime>12/24/2025 14:54:22</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/23/2025 17:02:46</publishTime>
+ <publishTime>12/24/2025 14:54:22</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>12/23/2025 17:02:48</publishTime>
+ <publishTime>12/24/2025 14:54:24</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/23/2025 17:02:48</publishTime>
+ <publishTime>12/24/2025 14:54:24</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/23/2025 17:02:42</publishTime>
+ <publishTime>12/24/2025 14:54:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/23/2025 17:02:42</publishTime>
+ <publishTime>12/24/2025 14:54:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/23/2025 17:02:44</publishTime>
+ <publishTime>12/24/2025 14:54:21</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/23/2025 17:02:44</publishTime>
+ <publishTime>12/24/2025 14:54:21</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/23/2025 17:02:43</publishTime>
+ <publishTime>12/24/2025 14:54:22</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/23/2025 17:02:43</publishTime>
+ <publishTime>12/24/2025 14:54:22</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/23/2025 17:02:41</publishTime>
+ <publishTime>12/24/2025 14:54:20</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/23/2025 17:02:41</publishTime>
+ <publishTime>12/24/2025 14:54:20</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>12/23/2025 09:36:09</publishTime>
+ <publishTime>12/24/2025 14:54:22</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/23/2025 09:36:09</publishTime>
+ <publishTime>12/24/2025 14:54:22</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/23/2025 17:03:05</publishTime>
+ <publishTime>12/24/2025 14:54:32</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/23/2025 17:03:05</publishTime>
+ <publishTime>12/24/2025 14:54:32</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -507,7 +507,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/23/2025 17:04:46</publishTime>
+ <publishTime>12/24/2025 14:54:43</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index e2fbf03..d6ed9cb 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 7da1fbc..bf706ca 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/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index d84c0cd..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 1c8db44..0d6e7ae 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,44 +1,6 @@
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-=======
->>>>>>> 033d6d49fbb0a924653c7fd3ef3700a24f37ee59
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index e2fbf03..d6ed9cb 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 7da1fbc..bf706ca 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index d77c332..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index 1107276..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
deleted file mode 100644
index fa3b43e..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
deleted file mode 100644
index 0cb5aeb..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1