From 1b3db8f5683373dd8e179b006e7314783dd1f9db Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 14:42:12 +0800
Subject: [PATCH] 文件补充
---
WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs | 84 +++--------------------------------------
1 files changed, 7 insertions(+), 77 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs b/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
index 03728cf..1e449a8 100644
--- a/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/MesWorkshopLineManager.cs
@@ -71,78 +71,6 @@
}
}
-
- /// <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;
- string 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>
@@ -153,6 +81,8 @@
{
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 + "'");
try
{
DataSet dset = new DataSet();
@@ -175,11 +105,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
{
--
Gitblit v1.9.3