From 25ba0980e71c958a661acbd149763079059b3922 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 11 十一月 2024 13:38:54 +0800
Subject: [PATCH] 出站单增加字段 HMachineWorkTimes 设备工时
---
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 38d1b4c..7a1cf54 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -854,6 +854,8 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
+ string HNumber = "";
+ string HName = "";
ds = oCN.RunProcReturn("select * from Gy_Employee where HItemID=" + HItemID, "Gy_Employee");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -863,6 +865,13 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+ else
+ {
+ HNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ HName = ds.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+
var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
if (HStopflag)
{
@@ -875,6 +884,24 @@
}
oCN.RunProc("delete from Gy_Employee where HItemID=" + HItemID);
+
+
+
+ //鍐欏叆鏃ュ織
+ string Operation = "鍒犻櫎"; //鎿嶄綔
+ string ComputerName = System.Net.Dns.GetHostName(); //璁惧鍚嶇О
+ string WorkList = Operation + "鑱屽憳锛岃亴鍛樹唬鐮侊細" + HNumber + "锛涜亴鍛樺悕绉帮細" + HName ; //鎿嶄綔璇︽儏
+ string MvarReportTitle = "鑱屽憳鍒楄〃"; //鎿嶄綔妯″潡
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡"; //鎿嶄綔妯″潡
+ string IPAddress = "";
+ //string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP鍦板潃
+ //string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;
+
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
+ );
+
+
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1280,7 +1307,7 @@
,HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HGroupID,HUseFlag,HMakeTime,HCREATEORGID,HUSEORGID
)
values
- ({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}',
+ ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
'{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}',{jsonData.HDeptID},{jsonData.HGroupID},'{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID})";
oCN.RunProc(sql);
@@ -1321,7 +1348,8 @@
try
{
//杩斿洖鍒楄〃淇℃伅
- ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeList where 绂佺敤鏍囪='' and HGroupID=" + HGroupID + " order by 鑱屽憳浠ｇ爜", "h_v_IF_EmployeeList");
+ ds = oCN.RunProcReturn("exec h_p_Pay_GetEmployeeByGroup " + HGroupID.ToString(), "h_p_Pay_GetEmployeeByGroup");
+ //ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeList where 绂佺敤鏍囪='' and HGroupID=" + HGroupID + " order by 鑱屽憳浠ｇ爜", "h_v_IF_EmployeeList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
--
Gitblit v1.9.1