From 940a9996c8bc71737c0e08f524d1d190b535a85b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 07 十二月 2022 09:30:26 +0800
Subject: [PATCH] 111
---
.gitignore | 3 ++-
WebAPI/Models/WorkDay.cs | 4 ++++
WebAPI/Controllers/Gy_WorkDayController.cs | 25 +++++++++----------------
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4ce6fdd..2e55010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -337,4 +337,5 @@
.localhistory/
# BeatPulse healthcheck temp database
-healthchecksdb
\ No newline at end of file
+healthchecksdb
+/WebAPI/Vlog
diff --git a/WebAPI/Controllers/Gy_WorkDayController.cs b/WebAPI/Controllers/Gy_WorkDayController.cs
index c3eab0e..5b33da0 100644
--- a/WebAPI/Controllers/Gy_WorkDayController.cs
+++ b/WebAPI/Controllers/Gy_WorkDayController.cs
@@ -96,14 +96,13 @@
msg2 = "[" + msg2.ToString() + "]";
List<WorkDay> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkDay>>(msg2);
long HItemID = list[0].HItemID;
-
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
{
oCN.BeginTran();
- string sql = string.Format(@"insert into Gy_WorkDay (HDate,HWorkBegin,HWorkEnd,HNoonbreakBegin,HNoonbreakEnd,HNightbreakBegin,HNightbreakEnd)
-values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}')", list[0].HDate, list[0].HWorkBegin, list[0].HWorkEnd, list[0].HNoonbreakBegin, list[0].HNoonbreakEnd, list[0].HNightbreakBegin, list[0].HNightbreakEnd);
+ string sql = string.Format(@"insert into Gy_WorkDay (HDate,HWorkBegin,HWorkEnd,HNoonbreakBegin,HNoonbreakEnd,HNightbreakBegin,HNightbreakEnd,HNoonbreakBegin2,HNoonbreakEnd2,HNightbreakBegin2,HNightbreakEnd2)
+values ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}')", list[0].HDate, list[0].HWorkBegin, list[0].HWorkEnd, list[0].HNoonbreakBegin, list[0].HNoonbreakEnd, list[0].HNightbreakBegin, list[0].HNightbreakEnd, list[0].HNoonbreakBegin2, list[0].HNoonbreakEnd2, list[0].HNightbreakBegin2, list[0].HNightbreakEnd2);
oCN.RunProc(sql);
oCN.Commit();
}
@@ -117,9 +116,13 @@
",HWorkBegin='" + list[0].HWorkBegin + "'" +
",HWorkEnd='" + list[0].HWorkEnd + "'" +
",HNoonbreakBegin='" + list[0].HNoonbreakBegin + "'" +
- ",HNoonbreakEnd=" + list[0].HNoonbreakEnd +
- ",HNightbreakBegin=" + list[0].HNightbreakBegin +
- ",HNightbreakEnd=" + list[0].HNightbreakEnd +
+ ",HNoonbreakEnd='" + list[0].HNoonbreakEnd + "'" +
+ ",HNightbreakBegin='" + list[0].HNightbreakBegin + "'" +
+ ",HNightbreakEnd='" + list[0].HNightbreakEnd + "'" +
+ ",HNoonbreakBegin2='" + list[0].HNoonbreakBegin2 + "'" +
+ ",HNoonbreakEnd2='" + list[0].HNoonbreakEnd2 + "'" +
+ ",HNightbreakBegin2='" + list[0].HNightbreakBegin2 + "'" +
+ ",HNightbreakEnd2='" + list[0].HNightbreakEnd2 + "'" +
" Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
@@ -194,16 +197,6 @@
DataSet ds1;
try
{
- ////鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
{
diff --git a/WebAPI/Models/WorkDay.cs b/WebAPI/Models/WorkDay.cs
index 36320f9..00eb1e4 100644
--- a/WebAPI/Models/WorkDay.cs
+++ b/WebAPI/Models/WorkDay.cs
@@ -15,5 +15,9 @@
public DateTime HNoonbreakEnd { get; set; }
public DateTime HNightbreakBegin { get; set; }
public DateTime HNightbreakEnd { get; set; }
+ public DateTime HNoonbreakBegin2 { get; set; }
+ public DateTime HNoonbreakEnd2 { get; set; }
+ public DateTime HNightbreakBegin2 { get; set; }
+ public DateTime HNightbreakEnd2 { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1