From 6d29ebf5ea086e862a5a7ca513e45af2be69a011 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 10 四月 2026 15:09:57 +0800
Subject: [PATCH] 添康钉钉同步维护
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 47b67a5..2c5d559 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -1007,6 +1007,33 @@
}
#endregion
+ #region 寮傚父鍙嶉鏍规嵁璁惧ID鑾峰彇鏁版嵁
+ [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListByHEquipID")]
+ [HttpGet]
+ public ApiResult<DataSet> Get_TransFerBillListByHEquipID(string HEquipID, string sWhere)
+ {
+ if (string.IsNullOrEmpty(HEquipID))
+ return new ApiResult<DataSet> { code = -1, msg = "璁惧涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format($@"
+ select c.HNumber 璀︽姤浠ｇ爜,CONVERT(VARCHAR(255), ABS(DATEDIFF(HOUR, a.HMakeDate, a.HUpdateDate))) + '灏忔椂' 鎸佺画鏃堕棿,a.HErrLev 鍘熷洜, a.HDate 鏃堕棿 from h_v_OA_ErrMsgBackBillEdit a
+ left join Gy_EquipFileBillMain b on a.HSourceID = b.HSourceID
+ left join Gy_ErrMsgBackType c on c.HItemID = a.HErrMsgBackTypeID
+ where b.HInterID = {HEquipID}
+ ");
+
+ if (!string.IsNullOrEmpty(sWhere))
+ {
+ sql += sWhere;
+ }
+ var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
+ if (dataSet == null)
+ return new ApiResult<DataSet> { code = -1, msg = "褰撳墠璁惧瀵瑰簲鐨勮鎶ヨ褰曚笉瀛樺湪" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
#region 寮傚父鍙嶉鍒楄〃缂栬緫鑾峰彇鏁版嵁
[Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetai")]
[HttpGet]
@@ -8712,7 +8739,18 @@
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'" , "h_p_OA_ErrMsgBackSelfQuery");
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //绯荤粺鍙傛暟 鏍规嵁瑙掕壊鏌ョ湅瀵瑰簲鐨勫崟鎹繘琛屼笅鎺�
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_Role '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_Role");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery");
+ }
+ }
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
@@ -8766,8 +8804,18 @@
string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
List<object> columnNameList = new List<object>();
-
- ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //绯荤粺鍙傛暟 鏍规嵁瑙掕壊鏌ョ湅瀵瑰簲鐨勫崟鎹繘琛屼笅鎺�
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP_Role '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP_Role");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
+ }
+ }
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
--
Gitblit v1.9.1