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/MesDeToLineController.cs | 93 +++++++++++++++++-----------------------------
1 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesDeToLineController.cs b/WebApi/Gs.JJGZ/MesDeToLineController.cs
index 1b7b1cf..2ad1a5d 100644
--- a/WebApi/Gs.JJGZ/MesDeToLineController.cs
+++ b/WebApi/Gs.JJGZ/MesDeToLineController.cs
@@ -1,4 +1,7 @@
-锘縰sing System.Dynamic;
+锘縰sing System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
@@ -15,7 +18,6 @@
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
-
public MesDeToLineController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -36,7 +38,7 @@
int everyPageSize = model.everyPageSize;
string sortName = model.sortName;
string keyWhere = model.keyWhere;
-
+
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -47,23 +49,19 @@
try
{
// 鏋勫缓鍒嗛〉鏌ヨSQL
- var whereClause = string.IsNullOrEmpty(keyWhere) ? "" : keyWhere;
- var orderBy = string.IsNullOrEmpty(sortName)
- ? "CREATE_DATE DESC"
- : $"{sortName} ASC";
-
+ string whereClause = string.IsNullOrEmpty(keyWhere) ? "" : keyWhere;
+ string orderBy = string.IsNullOrEmpty(sortName) ? "CREATE_DATE DESC" : $"{sortName} ASC";
+
// 鏌ヨ鎬绘暟
- var countSql =
- $"SELECT COUNT(1) FROM Mes_DepartmentToLine a WHERE 1=1 {whereClause}";
+ string countSql = $"SELECT COUNT(1) FROM Mes_DepartmentToLine a WHERE 1=1 {whereClause}";
var countResult = DbHelperSQL.GetSingle(countSql);
- var intTotal =
- countResult != null ? Convert.ToInt32(countResult) : 0;
-
+ int intTotal = countResult != null ? Convert.ToInt32(countResult) : 0;
+
if (intTotal > 0)
{
// 鍒嗛〉鏌ヨ鏁版嵁
- var offset = (currentPage - 1) * everyPageSize;
- var dataSql = $@"
+ int offset = (currentPage - 1) * everyPageSize;
+ string dataSql = $@"
SELECT * FROM (
SELECT ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum, A.*, b.Name as OrgName
FROM Mes_DepartmentToLine A
@@ -72,10 +70,9 @@
WHERE 1=1 {whereClause}
) AS T
WHERE T.RowNum BETWEEN {offset + 1} AND {offset + everyPageSize}";
-
+
var dsMain = DbHelperSQL.Query(dataSql);
- 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 pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
@@ -92,9 +89,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, "璇诲彇鎴愬姛");
}
@@ -109,13 +105,12 @@
{
string guid = model.guid.ToString();
dynamic m = new ExpandoObject();
- var mainTable = "Mes_DepartmentToLine";
+ string mainTable = "Mes_DepartmentToLine";
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();
@@ -125,10 +120,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, "璇诲彇澶辫触锛�");
}
@@ -147,9 +140,8 @@
m.outMsg = "";
try
{
- var sql =
- $"UPDATE Mes_DepartmentToLine SET CHECK_STATUS='{_inFieldValue}',CHECK_DATE = getdate(), CHECK_USER='{_userGuid}' WHERE GUID='{_guid}'";
- var rows = DbHelperSQL.ExecuteSql(sql);
+ string sql = $"UPDATE Mes_DepartmentToLine 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 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
}
@@ -158,10 +150,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, "鎿嶄綔鎴愬姛锛�");
}
@@ -190,18 +180,15 @@
string sql;
if (CheckGuid(guid))
{
- sql =
- $"UPDATE Mes_DepartmentToLine SET DepartmentId='{departmentId}', DepartmentName='{departmentName}', Line_No='{lineNo}', Line_Name='{lineName}',OrgId = '{orgId}' WHERE GUID='{guid}'";
+ sql = $"UPDATE Mes_DepartmentToLine SET DepartmentId='{departmentId}', DepartmentName='{departmentName}', Line_No='{lineNo}', Line_Name='{lineName}',OrgId = '{orgId}' WHERE GUID='{guid}'";
}
else
{
guid = Guid.NewGuid();
- sql =
- $" declare @userBy nvarchar(20); select top 1 @userBy=[ACCOUNT] from [dbo].[SYS_USER] where guid='{_userGuid}' " +
+ sql = $" declare @userBy nvarchar(20); select top 1 @userBy=[ACCOUNT] from [dbo].[SYS_USER] where guid='{_userGuid}' " +
$"INSERT INTO Mes_DepartmentToLine (GUID, CREATE_BY, CREATE_DATE, DepartmentId, DepartmentName, Line_No, Line_Name,OrgId, CHECK_STATUS) VALUES ('{guid}',@userBy,GETDATE(), '{departmentId}', '{departmentName}', '{lineNo}', '{lineName}','{orgId}', 0)";
}
-
- var rows = DbHelperSQL.ExecuteSql(sql);
+ int rows = DbHelperSQL.ExecuteSql(sql);
mObj.outSum = rows;
mObj.outGuid = guid.ToString();
mObj.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
@@ -212,12 +199,9 @@
mObj.outMsg = ex.Message;
mObj.outSum = -1;
}
-
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);
}
/// <summary>
@@ -236,8 +220,7 @@
{
if (CheckGuid(guid))
{
- var sql =
- $"DELETE FROM Mes_DepartmentToLine WHERE GUID='{guid}'";
+ string sql = $"DELETE FROM Mes_DepartmentToLine WHERE GUID='{guid}'";
_outSum = DbHelperSQL.ExecuteSql(sql);
_outMsg = _outSum > 0 ? "鍒犻櫎鎴愬姛锛�" : "鏈垹闄や换浣曟暟鎹�";
}
@@ -253,10 +236,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);
}
@@ -271,10 +252,9 @@
dynamic m = new ExpandoObject();
try
{
- var sql = "SELECT id AS 閮ㄩ棬Id, name AS 閮ㄩ棬鍚嶇О FROM OA_Department";
+ string sql = "SELECT id AS 閮ㄩ棬Id, name AS 閮ㄩ棬鍚嶇О FROM OA_Department";
var ds = DbHelperSQL.Query(sql);
- if (ds != null && ds.Tables.Count > 0 &&
- ds.Tables[0].Rows.Count > 0)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
var list = ds.Tables[0].TableToDynamicList();
m.list = list;
@@ -289,7 +269,6 @@
LogHelper.Debug(ToString(), ex.Message);
m.list = new List<dynamic>();
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
}
@@ -304,11 +283,9 @@
dynamic m = new ExpandoObject();
try
{
- var sql =
- "SELECT line_no AS 浜х嚎缂栧彿, name AS 浜х嚎鍚嶇О FROM MES_WORKSHOP_LINE";
+ string sql = "SELECT line_no AS 浜х嚎缂栧彿, name AS 浜х嚎鍚嶇О FROM MES_WORKSHOP_LINE";
var ds = DbHelperSQL.Query(sql);
- if (ds != null && ds.Tables.Count > 0 &&
- ds.Tables[0].Rows.Count > 0)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
var list = ds.Tables[0].TableToDynamicList();
m.list = list;
@@ -323,7 +300,7 @@
LogHelper.Debug(ToString(), ex.Message);
m.list = new List<dynamic>();
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3