From 678878aacae5fbda7675391cba5ad546cfdaf841 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 31 八月 2021 17:42:04 +0800
Subject: [PATCH] 设备故障登记列表、编辑优化
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 16 ++++++++++++++--
2 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index eb49fec..9434b26 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -515,7 +515,18 @@
public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ return ds;
}
#endregion
@@ -1638,6 +1649,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
@@ -1651,7 +1663,7 @@
lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2);
foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
+ oItem.HMaker = msg4;
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3817";
oItem.HBillSubType = "3817";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index a150cc4..5643afb 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>08/31/2021 09:25:02</publishTime>
+ <publishTime>08/31/2021 16:28:48</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/31/2021 09:25:02</publishTime>
+ <publishTime>08/31/2021 16:28:48</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/31/2021 09:25:00</publishTime>
+ <publishTime>08/31/2021 16:28:46</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/31/2021 09:25:00</publishTime>
+ <publishTime>08/31/2021 16:28:46</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/31/2021 09:24:59</publishTime>
+ <publishTime>08/31/2021 16:28:44</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/31/2021 09:24:59</publishTime>
+ <publishTime>08/31/2021 16:28:44</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>08/31/2021 09:24:59</publishTime>
+ <publishTime>08/31/2021 16:28:45</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/31/2021 09:24:59</publishTime>
+ <publishTime>08/31/2021 16:28:45</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/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:42</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:42</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:43</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:43</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/31/2021 09:24:58</publishTime>
+ <publishTime>08/31/2021 16:28:43</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/31/2021 09:25:03</publishTime>
+ <publishTime>08/31/2021 16:28:49</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/31/2021 09:25:03</publishTime>
+ <publishTime>08/31/2021 16:28:49</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/31/2021 09:25:11</publishTime>
+ <publishTime>08/31/2021 16:28:55</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1