From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs | 165 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 129 insertions(+), 36 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs b/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
index 1e449a8..b620c17 100644
--- a/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
@@ -10,12 +10,12 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using SqlSugar;
+
namespace Gs.BaseInfo.Services;
[ApiGroup(ApiGroupNames.BaseInfo)]
public class MesWorkshopLineManager : Repository<MesWorkshopLine>, IRomteService
{
-
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
@@ -43,16 +43,16 @@
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db
- .Queryable<MesWorkshopLine, SysDepartment, SysOrganization>(
- (a, c, org) => new object[]
- {
- JoinType.Left, a.DptId == c.Id.ToString(),
- JoinType.Left, c.FSubsidiary == org.Fid.ToString()
- }).Select((a, c, org) => new MesWorkshopLine
- {
- FSubsidiary = "(" + org.FNumber + ")" + org.Name,
- departName = c.Departmentname,
- }, true)
+ .Queryable<MesWorkshopLine, SysDepartment, SysOrganization>((a,
+ c, org) => new object[]
+ {
+ JoinType.Left, a.DptId == c.Id.ToString(),
+ JoinType.Left, c.FSubsidiary == org.Fid.ToString()
+ }).Select((a, c, org) => new MesWorkshopLine
+ {
+ FSubsidiary = "(" + org.FNumber + ")" + org.Name,
+ departName = c.Departmentname
+ }, true)
.Where(_sbWhere.ToString())
.OrderBy(_sbBy.ToString())
.ToPageList(query.currentPage, query.everyPageSize,
@@ -65,35 +65,120 @@
}
catch (Exception ex)
{
- LogHelper.Debug(this.ToString(), ex.Message);
+ LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<MesWorkshopLine>>.QuickReturn(pageList,
ReturnCode.Default, ex.Message);
}
}
+
/// <summary>
- /// 妫�鏌ユ槸鍚﹁浣跨敤锛屼娇鐢ㄥ悗涓嶈兘杩涜淇敼鍜屽垹闄�
+ /// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤碉紝鐢ㄤ簬鍚勭缁戝畾
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> GetListPage2(PageQuery model)
+ {
+ var currentPage = model.currentPage;
+ var everyPageSize = model.everyPageSize;
+ var sortName = string.IsNullOrEmpty(model.sortName)
+ ? "org.FNumber"
+ : model.sortName;
+ var keyWhere = model.keyWhere;
+ var keyType = model.keyType;
+ var sbSql = new StringBuilder();
+ sbSql.Append("select * from ");
+ sbSql.Append("( ");
+ sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
+ sortName + " " + model.sortOrder + ") as rowIndex,a.* ");
+ sbSql.Append(
+ ",d.departmentname,('(' + org.FNumber + ')' + org.NAME) as kcOrg");
+ if (string.IsNullOrEmpty(keyType))
+ sbSql.Append(",cast(0 as bit) as chkInt");
+ else
+ sbSql.Append(
+ ",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" +
+ keyType +
+ "' and b.aboutGuid=a.guid and b.fType='杩囩珯鏃剁粦瀹氱嚎浣�') as bit) as chkInt ");
+ sbSql.Append(" from MES_WORKSHOP_LINE a ");
+ sbSql.Append(
+ " left join SYS_DEPARTMENT d on a.dpt_id=d.departmentid left join SYS_ORGANIZATION org on d.FSubsidiary=org.FID");
+ sbSql.Append(" where 1=1");
+ sbSql.Append(keyWhere);
+ sbSql.Append(") as T ");
+ sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
+ everyPageSize + " and T.rowindex<=" + currentPage + "*" +
+ everyPageSize);
+ sbSql.Append(" order by rowindex asc ");
+ sbSql.Append(" select count(1) as intTotal from MES_WORKSHOP_LINE a ");
+ sbSql.Append(
+ " left join SYS_DEPARTMENT d on a.dpt_id=d.departmentid left join SYS_ORGANIZATION org on d.FSubsidiary=org.FID");
+ sbSql.Append(" where 1=1");
+ sbSql.Append(keyWhere);
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.Query(sbSql.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
+
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ {
+ var intTotal =
+ int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0
+ ? intTotal / everyPageSize + 1
+ : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
+ }
+
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
+
+
+ /// <summary>
+ /// 妫�鏌ユ槸鍚﹁浣跨敤锛屼娇鐢ㄥ悗涓嶈兘杩涜淇敼鍜屽垹闄�
/// </summary>
/// <param name="strGuid"></param>
/// <returns></returns>
-
private bool checkLine(string strGuid)
{
- System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append(" select top 1 daa015 as xt from WOMDAA daa left join MES_WORKSHOP_LINE line on daa.daa015=line.id where line.guid='" + strGuid + "'");
- sbSql.Append(" union all");
- sbSql.Append(" select top 1 lineId as xt from MES_WORK_PROD daa left join MES_WORKSHOP_LINE line on daa.lineId=line.id where line.guid='" + strGuid + "'");
+ var sbSql = new StringBuilder();
+ sbSql.Append(
+ " select top 1 daa015 as xt from WOMDAA daa left join MES_WORKSHOP_LINE line on daa.daa015=line.id where line.guid='" +
+ strGuid + "'");
try
{
- DataSet dset = new DataSet();
- dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
- if (dset != null && dset.Tables.Count > 0 && dset.Tables[0].Rows.Count > 0)
+ var dset = new DataSet();
+ dset = DbHelperSQL.Query(sbSql.ToString());
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
return true;
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
}
+
return false;
}
@@ -105,11 +190,11 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<string?> EditModel([FromBody] MesWorkshopLine model)
{
- bool _blChk = checkLine(model.Guid.ToString());
- if (_blChk)
- {
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "鎿嶄綔澶辫触锛岃绾夸綋宸蹭骇鐢熶簡鏁版嵁锛屾棤娉曡繘琛屼慨鏀癸紝鍒犻櫎绛夋搷浣滐紒");
- }
+ //bool _blChk = checkLine(model.Guid.ToString());
+ //if (_blChk)
+ //{
+ // return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "鎿嶄綔澶辫触锛岃绾夸綋宸蹭骇鐢熶簡鏁版嵁锛屾棤娉曡繘琛屼慨鏀癸紝鍒犻櫎绛夋搷浣滐紒");
+ //}
var _bl = false;
try
{
@@ -127,17 +212,24 @@
model.LastupdateBy = _userCode;
model.LastupdateDate = DateTime.Now;
}
+
//_bl = base.Update(model);
- _bl = Db.Updateable(model).IgnoreColumns(true).ExecuteCommand() > 0 ? true : false;
+ _bl = Db.Updateable(model).IgnoreColumns(true).ExecuteCommand() > 0
+ ? true
+ : false;
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
+ ex.Message);
}
+
if (_bl)
- return ReturnDto<string>.QuickReturn(model.Guid.ToString(), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "澧炲姞澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<string>.QuickReturn(model.Guid.ToString(),
+ ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
+ "澧炲姞澶辫触锛岃閲嶈瘯锛�");
}
/// <summary>
@@ -150,8 +242,10 @@
{
var m = base.GetById(model.Guid);
if (m != null)
- return ReturnDto<MesWorkshopLine>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
- return ReturnDto<MesWorkshopLine>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+ return ReturnDto<MesWorkshopLine>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ return ReturnDto<MesWorkshopLine>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛�");
}
@@ -165,11 +259,10 @@
{
var intArray = guidList.ToObject<string[]>();
int? rtnInt = (int)ReturnCode.Default;
- bool _blChk = checkLine(intArray[0]);
+ var _blChk = checkLine(intArray[0]);
if (_blChk)
- {
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, "鎿嶄綔澶辫触锛岃绾夸綋宸蹭骇鐢熶簡鏁版嵁锛屾棤娉曡繘琛屼慨鏀癸紝鍒犻櫎绛夋搷浣滐紒");
- }
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
+ "鎿嶄綔澶辫触锛岃绾夸綋宸蹭骇鐢熶簡鏁版嵁锛屾棤娉曡繘琛屼慨鏀癸紝鍒犻櫎绛夋搷浣滐紒");
var _manager = new MesWorkshopLineManager(_http);
rtnInt = _manager.DeleteById(intArray) ? intArray.Length : 0;
if (rtnInt > 0)
--
Gitblit v1.9.3