From 40c552a5e8ff4604d29b44f96a6912e8cbe53f98 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 25 八月 2021 21:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
.gitignore | 4 -
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36 +++++++++---------
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 41 ++++++++++----------
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 2
6 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
index 14fcf85..a5668fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,4 @@
/WorkM/obj/Debug
/WorkM/obj/Release
/WorkM/obj/x86/Debug
-/WorkM/obj/x86/Release
-/DBUtility/bin/x86/Debug
-/DBUtility/obj/x86/Debug
\ No newline at end of file
+/WorkM/obj/x86/Release
\ No newline at end of file
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index 11dc22d..5e0c1c2 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -74,25 +74,26 @@
DeleteBillSub2(lngBillKey);
omodel.HInterID = lngBillKey;
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
- oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
- " (HInterID,HEntryID,HMaintainItemID" +
- ",HMaintainPart,HClaim" +
- ",HManagerID" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ") ");
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ") ");
}
//鎻掑叆閰嶄欢椤瑰瓙琛�
foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
{
+
oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
" (HInterID,HEntryID,HMaterID" +
",HQty,HUnitID" +
@@ -157,7 +158,7 @@
if (DetailCol.Count > 0)
{
//鎻掑叆淇濆吇椤瑰瓙琛�
- foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
{
oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
" (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
@@ -166,11 +167,11 @@
",HCloseMan,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() + ",'" + oSub.HMaintainItem.ToString() + "'" +
- ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
- "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
") ");
}
}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..9fa8240
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..67556ba
--- /dev/null
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 13d594a..2832ddd 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -909,7 +909,7 @@
[HttpGet]
public object MESProductAuditProcessReportList(int HSourceID,int HSourceInterID,int HSourceEntryID,string HSourceBillNo, int HICMOInterID,int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "Sc_ICMOReportBill_Check";
+ string ModRightNameCheck = "MES_ProcExchReport_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 337330e..fb17dec 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/24/2021 15:02:10</publishTime>
+ <publishTime>08/25/2021 10:28:26</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/24/2021 15:02:10</publishTime>
+ <publishTime>08/25/2021 10:28:26</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/24/2021 15:02:08</publishTime>
+ <publishTime>08/25/2021 10:28:24</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/24/2021 15:02:08</publishTime>
+ <publishTime>08/25/2021 10:28:24</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:21</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:21</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
- <publishTime>08/24/2021 15:02:09</publishTime>
+ <publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
<publishTime>08/09/2021 09:06:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/24/2021 15:02:07</publishTime>
+ <publishTime>08/25/2021 10:28:22</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/24/2021 15:02:07</publishTime>
+ <publishTime>08/25/2021 10:28:22</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/09/2021 09:06:27</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/24/2021 15:02:05</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/24/2021 15:02:05</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/24/2021 15:02:06</publishTime>
+ <publishTime>08/25/2021 10:28:20</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/24/2021 15:02:11</publishTime>
+ <publishTime>08/25/2021 10:28:28</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/24/2021 15:02:11</publishTime>
+ <publishTime>08/25/2021 10:28:28</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/24/2021 15:02:18</publishTime>
+ <publishTime>08/25/2021 10:28:35</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1