From 5cd7423376cef6dbb46904cfde4c821c2ddb5190 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期三, 18 三月 2026 19:03:02 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 055cb7f..0684f51 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -7436,9 +7436,76 @@
}
#endregion
- #region 宸ヤ綔鑱旂郴鍗曞垪琛�
+ #region 宸ヤ綔鑱旂郴鍗曞垪琛� 浣跨敤涓嬫媺鍔犺浇
[Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList")]
[HttpGet]
+ public object GetOA_WorkLinkBillList2(string sWhere, string user, int page = -1, int size = -1)
+ {
+ if(page == -1 || size == -1)
+ {
+ return GetOA_WorkLinkBillList(sWhere, user);
+ }else
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("OA_WorkLinkBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ string sql = "select * from h_v_OA_WorkLinkBillAllList order by 鍗曟嵁鍙� desc";
+ sql += $@" OFFSET {(page-1)*size} ROWS
+ FETCH NEXT {size} ROWS ONLY; ";
+ ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_OA_WorkLinkBillAllList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ sql += $@" OFFSET {(page - 1) * size} ROWS
+ FETCH NEXT {size} ROWS ONLY; ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ #endregion
+
+
+ #region 宸ヤ綔鑱旂郴鍗曞垪琛�
public object GetOA_WorkLinkBillList(string sWhere, string user)
{
try
--
Gitblit v1.9.1