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 | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 173 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 5dc7d1b..2c5d559 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -907,6 +907,7 @@
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBarCode = DBUtility.ClsPub.isStrNull(oItem.HBarCode);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -1003,6 +1004,33 @@
objJsonResult.data = 1;
return objJsonResult;
}
+ }
+ #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
@@ -7435,9 +7463,128 @@
}
#endregion
- #region 宸ヤ綔鑱旂郴鍗曞垪琛�
+ #region 宸ヤ綔鑱旂郴鍗曞垪琛� 浣跨敤涓嬫媺鍔犺浇 璋冪敤瀛樺偍杩囩▼
+ [Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListProcess")]
+ [HttpGet]
+ public object GetOA_WorkLinkBillList2(string beginDate, string endDate, string user, string type, int page = -1, int size = -1)
+ {
+ 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;
+ }
+
+ string sql = $"exec h_p_OA_WorkLinkBillAllList '{user}', '{type}', '{page}', '{size}', '{beginDate}', '{endDate}'";
+
+ ds = oCN.RunProcReturn(sql, "h_p_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 宸ヤ綔鑱旂郴鍗曞垪琛� 浣跨敤涓嬫媺鍔犺浇
[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
@@ -7463,6 +7610,7 @@
{
string sql1 = "select * from h_v_OA_WorkLinkBillAllList where 1 = 1 ";
string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+
ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
}
@@ -8591,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)
{
@@ -8645,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