From 0eb5c267746a773fad80398dd935fed67bba8b5a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 13 十二月 2025 14:36:36 +0800
Subject: [PATCH] 物料单位换算信息前端显示
---
WebApi/Gs.JJGZ/MesJjgzScheduleController.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs b/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
index c1709d9..2882ea0 100644
--- a/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
@@ -52,7 +52,7 @@
string orderBy = string.IsNullOrEmpty(sortName) ? "CREATE_DATE DESC" : $"{sortName} ASC";
// 鏌ヨ鎬绘暟
- string countSql = $"SELECT COUNT(1) FROM MES_JJGZ_SCHEDULES WHERE 1=1 {keyWhere}";
+ string countSql = $"SELECT COUNT(1) FROM MES_JJGZ_SCHEDULES a LEFT JOIN SYS_USER cj ON cj.ACCOUNT=a.create_by WHERE 1=1 {keyWhere}";
var countResult = DbHelperSQL.GetSingle(countSql);
int intTotal = countResult != null ? Convert.ToInt32(countResult) : 0;
@@ -62,8 +62,12 @@
int offset = (currentPage - 1) * everyPageSize;
string dataSql = $@"
SELECT * FROM (
- SELECT ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum, *
- FROM MES_JJGZ_SCHEDULES
+ SELECT
+ ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum,
+ a.*,
+ cj.USER_NAME as createByName
+ FROM MES_JJGZ_SCHEDULES a
+ LEFT JOIN SYS_USER cj ON cj.ACCOUNT = a.create_by
WHERE 1=1 {keyWhere}
) AS T
WHERE T.RowNum BETWEEN {offset + 1} AND {offset + everyPageSize}";
@@ -105,7 +109,7 @@
string mainTable = "MES_JJGZ_SCHEDULES";
try
{
- string sqlMain = $"SELECT * FROM {mainTable} WHERE GUID='{guid}'";
+ string sqlMain = $"SELECT a.* ,cj.USER_NAME as createByName FROM {mainTable} a left join SYS_USER cj on cj.ACCOUNT=a.create_by WHERE a.GUID='{guid}'";
var dsMain = DbHelperSQL.Query(sqlMain);
if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
--
Gitblit v1.9.3