From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs | 169 ++++++++++++++++++++++----------------------------------
1 files changed, 66 insertions(+), 103 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs b/WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs
index 2f8c48f..d99e78a 100644
--- a/WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzErrorJsController.cs
@@ -1,14 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using System.Text;
-using Gs.Toolbox;
+锘縰sing Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
using static Gs.Toolbox.UtilityHelper;
namespace Gs.JJGZ;
@@ -19,7 +19,6 @@
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
-
public MesJjgzErrorJsController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -83,9 +82,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ ReturnCode.Exception, ex.Message);
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -103,20 +101,18 @@
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
// 鍋囪涓昏〃涓篗ES_JJGZ_JS_SALARY锛屾槑缁嗚〃涓篗ES_JJGZ_JS_SALARY_DETAIL
- var mainTable = "MES_JJGZ_ERRORJS";
+ string mainTable = "MES_JJGZ_ERRORJS";
try
{
- var sqlMain = $"SELECT * FROM {mainTable} WHERE guid='{guid}'";
+ string sqlMain = $"SELECT * FROM {mainTable} WHERE guid='{guid}'";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var dr = dsMain.Tables[0].Rows[0];
m = dr.RowToDynamic();
}
- var sqlMain1 =
- $"SELECT * FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
+ string sqlMain1 = $"SELECT * FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
var _tb = DbHelperSQL.Query(sqlMain1);
@@ -127,10 +123,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -150,9 +144,8 @@
try
{
// 鍋囪鎻愪氦灏辨槸鏇存柊鏌愪釜瀛楁
- var sql =
- $"UPDATE MES_JJGZ_ERRORJS SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
- var rows = DbHelperSQL.ExecuteSql(sql);
+ string sql = $"UPDATE MES_JJGZ_ERRORJS SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
+ int rows = DbHelperSQL.ExecuteSql(sql);
m.outSum = rows;
m.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
}
@@ -161,10 +154,8 @@
LogHelper.Debug(ToString(), "EditModelSubmit error锛�" + ex.Message);
m.outMsg = ex.Message;
m.outSum = -1;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
@@ -179,35 +170,32 @@
{
Guid? guid = model.guid; //涓婚敭
string hourlyType = model.hourlyType; //鍘熷洜
- string errorType = model.errorType; //宸ュ崟
- string errorTime = model.errorTime; //缁勭粐
- string hourlySalary = model.hourlySalary; //缁勭粐
- string remark = model.remark; //缁勭粐
- string DAA001 = model.DAA001; //缁勭粐
- string DAAType = model.DAAType; //缁勭粐
- string OrgId = model.OrgId; //缁勭粐
+ string errorType = model.errorType;//宸ュ崟
+ string errorTime = model.errorTime;//缁勭粐
+ string hourlySalary = model.hourlySalary;//缁勭粐
+ string remark = model.remark;//缁勭粐
+ string DAA001 = model.DAA001;//缁勭粐
+ string DAAType = model.DAAType;//缁勭粐
+ string OrgId = model.OrgId;//缁勭粐
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
{
string _guid = m.Guid.ToString();
var _line = m.ID + _split
- + m.Staff_Id + _split
- + m.Staff_No + _split
- + m.Staff_Name + _split
- + m.Hour + _split
- + m.Line_No + _split
- + m.Line_Name + _split
- + m.Salary + _split
- + m.Remark + _split
- + (CheckGuid(_guid)
- ? _guid
- : Guid.Empty.ToString());
+ + m.Staff_Id + _split
+ + m.Staff_No + _split
+ + m.Staff_Name + _split
+ + m.Hour + _split
+ + m.Line_No + _split
+ + m.Line_Name + _split
+ + m.Salary + _split
+ + m.Remark + _split
+ + (CheckGuid(_guid) ? _guid : Guid.Empty.ToString());
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
}
-
dynamic mObj = new ExpandoObject();
mObj.outMsg = "";
mObj.outSum = -1;
@@ -223,23 +211,22 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@outGuid", SqlDbType.UniqueIdentifier),
- new("@outNo", SqlDbType.NVarChar, 300),
- new("@inOrderGuid",
- CheckGuid(guid) ? guid : DBNull.Value),
- new("@inErrorTime", errorTime),
- new("@inErrorType", errorType),
- new("@inHourlyType", hourlyType),
- new("@inHourlySalary", hourlySalary),
- new("@inRemark", remark),
- new("@inDAA001", DAA001),
- new("@inDAAType", DAAType),
- new("@inOrgId", OrgId),
- new("@inEdtUserGuid", _userGuid),
- new("@inLineList", _sb.ToString())
- };
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@outGuid", SqlDbType.UniqueIdentifier),
+ new("@outNo", SqlDbType.NVarChar, 300),
+ new("@inOrderGuid", CheckGuid(guid) ? guid : DBNull.Value),
+ new("@inErrorTime",errorTime),
+ new("@inErrorType",errorType),
+ new("@inHourlyType",hourlyType),
+ new("@inHourlySalary",hourlySalary),
+ new("@inRemark",remark),
+ new("@inDAA001",DAA001),
+ new("@inDAAType",DAAType),
+ new("@inOrgId",OrgId),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inLineList", _sb.ToString())
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
parameters[2].Direction = ParameterDirection.Output;
@@ -265,12 +252,9 @@
}
}
}
-
if (mObj.outSum <= 0)
- return ReturnDto<dynamic>.QuickReturn(mObj,
- ReturnCode.Exception, mObj.outMsg);
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
- mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
}
}
@@ -291,8 +275,7 @@
{
if (CheckGuid(guid))
{
- var sql =
- $"DELETE FROM MES_JJGZ_ERRORJS WHERE guid='{guid}' DELETE FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
+ string sql = $"DELETE FROM MES_JJGZ_ERRORJS WHERE guid='{guid}' DELETE FROM MES_JJGZ_ERRORJS_DETAIL WHERE pid='{guid}'";
_outSum = DbHelperSQL.ExecuteSql(sql);
_outMsg = _outSum > 0 ? "鍒犻櫎鎴愬姛锛�" : "鏈垹闄や换浣曟暟鎹�";
}
@@ -308,10 +291,8 @@
_outMsg = ex.Message;
_outSum = -1;
}
-
if (_outSum <= 0)
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, _outMsg);
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
}
@@ -324,14 +305,12 @@
public ReturnDto<ExpandoObject> GetTimeType([FromBody] dynamic model)
{
dynamic m = new ExpandoObject();
- var mainTable = "MES_JJGZ_TIMETYPE";
+ string mainTable = "MES_JJGZ_TIMETYPE";
try
{
- var sqlMain =
- "SELECT HourlyType 璁℃椂绫诲瀷,HourlySalary 璁℃椂鍗曚环 FROM MES_JJGZ_JSSALARY WHERE CHECK_STATUS = 1";
+ string sqlMain = $"SELECT HourlyType 璁℃椂绫诲瀷,HourlySalary 璁℃椂鍗曚环 FROM MES_JJGZ_JSSALARY WHERE CHECK_STATUS = 1";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var _tb = dsMain.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -341,10 +320,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -359,11 +336,9 @@
dynamic m = new ExpandoObject();
try
{
- var sqlMain =
- "select daa001 宸ュ崟鍙�,daa002 浜у搧缂栫爜,daa003 浜у搧鍚嶇О,daa004 浜у搧瑙勬牸,daa025 宸ュ崟绫诲瀷 from WOMDAA";
+ string sqlMain = $"select daa001 宸ュ崟鍙�,daa002 浜у搧缂栫爜,daa003 浜у搧鍚嶇О,daa004 浜у搧瑙勬牸,daa025 宸ュ崟绫诲瀷 from WOMDAA";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var _tb = dsMain.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -373,10 +348,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -391,10 +364,9 @@
dynamic m = new ExpandoObject();
try
{
- var sqlMain = "select line_no 浜х嚎,name 浜х嚎鍚嶇О from MES_WORKSHOP_LINE";
+ string sqlMain = $"select line_no 浜х嚎,name 浜х嚎鍚嶇О from MES_WORKSHOP_LINE";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var _tb = dsMain.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -404,10 +376,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -430,12 +400,9 @@
sbLine.Append(",");
sbLine.Append(str);
}
-
- var sqlMain =
- $"select a.id as Staff_Id,Staff_No ,Staff_Name,0 Hour ,d.Line_No Line_No , d.Line_Name Line_Name,0 Salary,''Remark,'' Id from MES_STAFF a left join OA_User b on a.staff_no = b.jobnumber left join Mes_DepartmentToLine d on d.DepartmentId = b.department where a.id in (select line from dbo.fn_split('{sbLine}',','))";
+ string sqlMain = $"select a.id as Staff_Id,Staff_No ,Staff_Name,0 Hour ,d.Line_No Line_No , d.Line_Name Line_Name,0 Salary,''Remark,'' Id from MES_STAFF a left join OA_User b on a.staff_no = b.jobnumber left join Mes_DepartmentToLine d on d.DepartmentId = b.department where a.id in (select line from dbo.fn_split('{sbLine.ToString()}',','))";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var _tb = dsMain.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -445,10 +412,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -470,8 +435,7 @@
{
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd =
- new SqlCommand("[prc_item_staff_select]", conn))
+ using (var cmd = new SqlCommand("[prc_item_staff_select]", conn))
{
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
@@ -487,7 +451,7 @@
new("@inP2", "")
};
foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
+ cmd.Parameters.Add(parameter);
using (var dt = new SqlDataAdapter(cmd))
{
dt.Fill(dset, "0");
@@ -499,8 +463,7 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(),
- "prc_item_staff_select error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "prc_item_staff_select error锛�" + ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(
default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
--
Gitblit v1.9.3