From 552fda4967d0f762fae21fae54c5f8b57b8eb3ea Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 30 三月 2026 13:28:45 +0800
Subject: [PATCH] 凯贝立讯客户标签内箱码生成时流水号回填修正，金蝶云生成委外工序发出单调用方法修正
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 7ae87df..b8491fd 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -80,8 +80,8 @@
#endregion
- #region 涓嬫帹鏍规嵁璁惧id鏌ヨ鍥炴樉
- [Route("Gy_EquipFileMain/get锘縎b_EquipList")]
+ #region 涓嬫帹鏍规嵁璁惧id鏌y_EquipFileMain/GetResumeList璇㈠洖鏄�
+ [Route("Gy_EquipFileMain/getSb_EquipList")]
[HttpGet]
public object getSb_EquipBeginBillList(int HInterID, string user)
{
@@ -1322,6 +1322,73 @@
}
#endregion
+ #region 璁惧杩愯鎶ヨ〃(鍒嗛〉)
+ [Route("SB_EquipRunningStatus/ReportPage")]
+ [HttpGet]
+ public object ReportPage(string sWhere, string user, int page=1, int size=50)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipRunningStatusReport " + sWhere + " order by 鎵�灞炴棩鏈� desc", "h_v_Sb_EquipRunningStatusReport");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRunningStatusReport 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_Sb_EquipRunningStatusReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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;
+
+ //if (ds.Tables[0].Rows.Count != 0 && ds != null)
+ //{
+
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳暟鎹�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 璁惧杩愯鐘舵�佹姤琛�
[Route("SB_EquipRunningStatus/Report")]
--
Gitblit v1.9.1