From ce842e6e2a4dd7e488e28d091fc481ccd77c5f9a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 22 十月 2021 15:34:26 +0800
Subject: [PATCH] 改制申请单加改型模式
---
WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs | 4 ++--
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs | 1 +
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 2 +-
4 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 8a698fb..dc82efa 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -508,7 +508,7 @@
//oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
//oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
//oItem.HRemark = ""; //澶囨敞
-
+
//oItem.HMainSourceInterID = oItem.HInterID;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
index c7e9544..d653986 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
@@ -46,14 +46,14 @@
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HDate," +
"HMaker,HMakeDate,HInnerBillNo,HRepairID,HDeptID,HRepairBeginDate,HRepairEndDate," +
"HCycleUnit,HPlanTimes,HTimes,HChangeNum,HEmpID,HManagerID,HRepairType,HSupID," +
- "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark" +
+ "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark,HChangeType" +
") " +
" values("+omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
",'" + omodel.HMaker + "',getdate()" +
",'" + omodel.HInnerBillNo+"',"+ omodel.HRepairID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate +
"','" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HChangeNum.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
",'" + omodel.HRepairType + "'," + omodel.HSupID.ToString() + "," + omodel.HNewMaterID.ToString() + ",'"+ omodel.HNewName + "','" + omodel.HNewModel + "','" + omodel.HNewModel2 + "','" + omodel.HExplanation + "','" + omodel.HRepairContent + "','" + omodel.HRemark+
- "') ");
+ "','"+omodel.HChangeType + "') ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_MouldRepairChangeBillSub oSub in DetailColl)
{
diff --git a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
index 114f0e8..3d19e8c 100644
--- a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
+++ b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
@@ -28,6 +28,7 @@
public string HNewBarCode; /*--鏀瑰埗鍚庢柊鏉＄爜*/
public string HNewDesignLife; /*--鏂拌璁″鍛�*/
public string HExplanation; /* --鏀瑰埗瑕佹眰*/
+ public string HChangeType; /* --鏀瑰瀷绫诲瀷*/
public string HRemark; /* --澶囨敞*/
public string HInnerBillNo; /* --鍐呴儴鍗曟嵁鍙�*/
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 39ce26c..f638865 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/21/2021 18:45:37</publishTime>
+ <publishTime>10/22/2021 15:00:35</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/21/2021 18:45:37</publishTime>
+ <publishTime>10/22/2021 15:00:35</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/21/2021 18:45:35</publishTime>
+ <publishTime>10/22/2021 15:00:33</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/21/2021 18:45:35</publishTime>
+ <publishTime>10/22/2021 15:00:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/21/2021 18:45:30</publishTime>
+ <publishTime>10/22/2021 15:00:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/21/2021 18:45:30</publishTime>
+ <publishTime>10/22/2021 15:00:29</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>10/21/2021 18:45:30</publishTime>
+ <publishTime>10/22/2021 15:00:30</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/21/2021 18:45:30</publishTime>
+ <publishTime>10/22/2021 15:00:30</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>10/21/2021 18:45:27</publishTime>
+ <publishTime>10/22/2021 15:00:27</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/21/2021 18:45:27</publishTime>
+ <publishTime>10/22/2021 15:00:27</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/21/2021 18:45:28</publishTime>
+ <publishTime>10/22/2021 15:00:28</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/21/2021 18:45:28</publishTime>
+ <publishTime>10/22/2021 15:00:28</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/21/2021 18:45:28</publishTime>
+ <publishTime>10/22/2021 15:00:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/21/2021 18:45:28</publishTime>
+ <publishTime>10/22/2021 15:00:29</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>10/21/2021 18:45:41</publishTime>
+ <publishTime>10/22/2021 15:00:38</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/21/2021 18:45:41</publishTime>
+ <publishTime>10/22/2021 15:00:38</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>10/21/2021 18:46:44</publishTime>
+ <publishTime>10/22/2021 15:01:44</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1