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.Wom/WorkService/WorkProController.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/WebApi/Gs.Wom/WorkService/WorkProController.cs b/WebApi/Gs.Wom/WorkService/WorkProController.cs
index 8b7528e..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;
@@ -153,20 +156,18 @@
string remark = model.remark;
string isBack = model.isBack;
string isStatus = model.isStatus;
- string isZsm = model.isZsm;
- string isTbm = model.isTbm;
string description = model.description;
int? rtnInt = (int)ReturnCode.Default;
System.Text.StringBuilder sbSql = new StringBuilder();
if (!CheckGuid(guid))
{
guid= Guid.NewGuid().ToString();
- sbSql.Append("INSERT INTO [dbo].[WORK_PROCESS] ([guid] ,[processNo] ,[processName] ,[remark] ,[isBack] ,[isStatus] ,[description] ,[createBy] ,[createDate] ,[lastUpdateBy] ,[lastUpdateDate],isZsm,isTbm)");
- sbSql.Append(" values( '"+ guid + "',@processNo,@processName,@remark,@isBack,@isStatus,@description,'" + _userCode + "',getdate(),'" + _userCode + "',getdate(),@isZsm,@isTbm)");
+ sbSql.Append("INSERT INTO [dbo].[WORK_PROCESS] ([guid] ,[processNo] ,[processName] ,[remark] ,[isBack] ,[isStatus] ,[description] ,[createBy] ,[createDate] ,[lastUpdateBy] ,[lastUpdateDate])");
+ sbSql.Append(" values( '"+ guid + "',@processNo,@processName,@remark,@isBack,@isStatus,@description,'" + _userCode + "',getdate(),'" + _userCode + "',getdate())");
}
else
{
- sbSql.Append("UPDATE [dbo].[WORK_PROCESS] SET [processNo] =@processNo,[processName] =@processName,[remark] =@remark,[isBack] =@isBack,[isStatus] =@isStatus,[description] =@description,[lastUpdateBy] ='" + _userCode + "',[lastUpdateDate] =getdate(),isZsm=@isZsm,isTbm=@isTbm where guid='" + guid.ToString()+"'");
+ sbSql.Append("UPDATE [dbo].[WORK_PROCESS] SET [processNo] =@processNo,[processName] =@processName,[remark] =@remark,[isBack] =@isBack,[isStatus] =@isStatus,[description] =@description,[lastUpdateBy] ='" + _userCode + "',[lastUpdateDate] =getdate() where guid='"+guid.ToString()+"'");
}
SqlParameter[] parameters =
{
@@ -176,8 +177,6 @@
new("@isBack", isBack),
new("@isStatus", isStatus),
new("@description", description),
- new("@isZsm", isZsm),
- new("@isTbm", isTbm),
};
try
{
--
Gitblit v1.9.3