From 65a2e96d657c7a3b6e0da2af6d223bd765476c0b Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 27 八月 2025 14:11:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService
---
WebApi/Gs.Wom/WorkService/WorkProController.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/WebApi/Gs.Wom/WorkService/WorkProController.cs b/WebApi/Gs.Wom/WorkService/WorkProController.cs
index 95d19cf..8c7cb2c 100644
--- a/WebApi/Gs.Wom/WorkService/WorkProController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkProController.cs
@@ -38,6 +38,9 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<PageList<dynamic>> GetListPage([FromBody] PageQuery model)
{
+
+ //(case a.isStatus when 1 then '姝ｅ父' when - 1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt
+
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
var sortName = string.IsNullOrEmpty(model.sortName)
@@ -49,7 +52,7 @@
sbSql.Append("( ");
sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
sortName + " " + model.sortOrder +
- ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.processNo+':'+a.processName) as processNoAndName,(case a.isStatus when 1 then '姝ｅ父' when -1 then '绂佺敤' else cast(a.isStatus as nvarchar(4)) end) as isStatusTxt from WORK_PROCESS a where 1=1" +
+ ") as rowIndex,cast(0 as bit) as chkInt, a.*,(a.PROC_NO+':'+a.PROC_NAME) as processNoAndName from MES_PROC_INFO a where 1=1" +
keyWhere);
sbSql.Append(") as T ");
sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
@@ -57,8 +60,8 @@
everyPageSize);
sbSql.Append(" order by rowindex asc ");
sbSql.Append(
- " select count(1) as intTotal from WORK_PROCESS a where 1=1 " +
- keyWhere);
+ " select count(1) as intTotal from MES_PROC_INFO a where 1=1 " +
+ keyWhere);
var dset = new DataSet();
try
{
@@ -120,7 +123,7 @@
return ReturnDto<int>.QuickReturn(default(int?),
ReturnCode.Exception, "鍒犻櫎澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append("delete from WORK_PROCESS ");
+ sbSql.Append("delete from MES_PROC_INFO ");
sbSql.Append(" where guid in (select line from dbo.fn_split('" + sbGuid.ToString() + "',','))");
var rows = DbHelperSQL.ExecuteSql(sbSql.ToString());
rtnInt = rows;
--
Gitblit v1.9.3