From 2f19dbfe2d75abdd583f2ecc1b5d03cc4f3be968 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 15 一月 2026 12:44:46 +0800
Subject: [PATCH] 新增 工作联系表 分页查询 接口 新增 WebSocket 服务端
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 1e91043..a11b7cc 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -6591,6 +6591,69 @@
}
#endregion
+ #region 宸ヤ綔鑱旂郴鍗曞垪琛� 鍒嗛〉
+ [Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListPage")]
+ [HttpGet]
+ public object GetOA_WorkLinkBillListPage(string sWhere, string user, int page, int size)
+ {
+ 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 count(1) count from h_v_OA_WorkLinkBillAllList
+ select * from h_v_OA_WorkLinkBillAllList order by 鍗曟嵁鍙� desc
+ offset {(page - 1) * size} rows fetch next {size} rows only";
+ ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
+ }
+ else
+ {
+ string sql1 = $@"
+ select count(1) count from h_v_OA_WorkLinkBillAllList where 1 = 1 {sWhere}
+ select * from h_v_OA_WorkLinkBillAllList where 1 = 1
+ {sWhere} order by 鍗曟嵁鍙� desc
+ offset {(page - 1) * size} rows fetch next {size} rows only";
+ ds = oCN.RunProcReturn(sql1, "h_v_OA_WorkLinkBillAllList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[1];
+ 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 宸ヤ綔鑱旂郴鍗曠紪杈戣幏鍙栨暟鎹�
[Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListCheckDetai")]
[HttpGet]
@@ -7658,7 +7721,14 @@
string sql = "select a.HSourceBillNo 娴佽浆鍗″彿,a.HSourceBillType 娴佽浆鍗＄被鍨�,a.HSourceInterID 娴佽浆鍗′富鍐呯爜,a.HSourceEntryID 娴佽浆鍗″瓙鍐呯爜,b.HNumber 鐗╂枡浠ｇ爜,b.HName 鐗╂枡鍚嶇О,b.HModel 瑙勬牸鍨嬪彿,a.HDatePlanQty 璁″垝鏁伴噺,a.HSourceID,c.HName 鐢熶骇璧勬簮 from Sc_ICMOBillStatus_Tmp a " +
"left join Gy_Material b on a.HMaterID=b.HItemID left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "' and a.HICMOStatus=1";
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
-
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲搴旀纭姸鎬佸伐鍗曚俊鎭�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -7941,13 +8011,13 @@
{
try
{
- string sql = "select HErrMsgBackInterID,HErrMsgBackEntryID,HSendMan,HDescription,HReceiveMan from OA_ErrMsgBackHandleBillMain where HInterID=" + HInterID;
+ string sql = "select HErrMsgBackInterID,HErrMsgBackEntryID,HSendMan,HDescription,HReceiveMan from OA_ErrMsgBackHandleBillMain where HErrMsgBackInterID=" + HInterID;
//鏇存柊寮傚父鍙嶉澶勭悊鍗曚綔搴�
- oCN.RunProc("update OA_ErrMsgBackHandleBillMain set HBillStatus=4, HDeleteDate=GETDATE(),HDeleteMan='" + user + "' where HInterID="+ HInterID);
+ oCN.RunProc("update OA_ErrMsgBackHandleBillMain set HBillStatus=4, HDeleteDate=GETDATE(),HDeleteMan='" + user + "' where HErrMsgBackInterID=" + HInterID);
DataSet dt = oCN.RunProcReturn(sql, "OA_ErrMsgBackHandleBillMain");
- //鍙嶉澶勭悊鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鐘舵��
- string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='9' where HInterID='" + dt.Tables[0].Rows[0]["HErrMsgBackInterID"].ToString() + "' ";
+ //鍙嶉澶勭悊鍗曢┏鍥炲悗,鏇存柊寮傚父鍙嶉鍗曠殑鐘舵��
+ string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='13' where HInterID='" + dt.Tables[0].Rows[0]["HErrMsgBackInterID"].ToString() + "' ";
oCN.RunProc(sql1);
_ = SendDingDingAsync(dt.Tables[0].Rows[0]["HSendMan"].ToString(), 4, dt.Tables[0].Rows[0]["HDescription"].ToString(), dt.Tables[0].Rows[0]["HReceiveMan"].ToString());
@@ -7966,5 +8036,43 @@
}
}
#endregion
+
+ #region 璁惧鐐规璁板綍PDA 淇濆瓨鍚� 鏌ヨ鏄惁鏈塏G 璋冩暣瀹夌伅
+
+ [Route("Sc_MESTransFerWorkBill/getGy_EquipFile_AD")]
+ [HttpGet]
+ public object getGy_EquipFile_AD(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql = "select * from h_v_Gy_EquipFileMainList where hmainid='" + HInterID + "'";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
+
+ //娣诲姞鍒楀悕
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1