From 59f31f0caeef6fb37f397646efbcd19738299122 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 25 十一月 2024 16:16:12 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 5e17f82..e5a9bec 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -530,7 +530,7 @@
string sql =string.Format(@"select A.HInterID,b.HEntryID,A.HBillStatus,A.HBillNo,A.HDate,A.HContext,A.HDescription,A.HRemark,
A.HQty,A.HSendType,a.HForm,a.HChangeNote,a.HNote,a.HBadProcMan,f1.HName HBadProcManName,
a.HQEMan,f2.HName HQEManName,a.HSourceID,s.HName HSourceName,a.HShiftsID,s1.HName HShiftsName,
- A.HDeptID,D.HName HDeptName, A.HSendMan,
+ A.HDeptID,D.HName HDeptName, A.HSendMan,a.HCenterID HCenterID,wo.HName HCenterName,
A.HReceiveMan,A.HCopyMan,A.HHasten,
A.HLevel,A.HMaterNumber,A.HMaterName,A.HMaterModel,
B.HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate,A.HChecker,A.HCheckDate,A.HCloseMan,A.HCloseDate,A.HDeleteMan,A.HDeleteDate,
@@ -545,6 +545,7 @@
left join Gy_Employee f2 on a.HQEMan=f2.HItemID
left join Gy_Source s on a.HSourceID=s.HItemID
left join Gy_Shifts s1 on a.HShiftsID=s1.HItemID
+ left join Gy_WorkCenter wo on a.HCenterID=wo.HItemID
where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'");
var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
@@ -1839,7 +1840,7 @@
[Route("OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive")]
[HttpGet]
- public object ErrMsgBackReceive(string sWhere, string user)
+ public object ErrMsgBackReceive(string sWhere,string num, string user)
{
try
{
@@ -1854,18 +1855,38 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- if (sWhere == null || sWhere.Equals(""))
+ if (num=="2") //鎶ュ伐鍙拌幏鍙栧埛鍗＄鍒版暟鎹�
{
- string sql = "select * from h_v_OA_ErrMsgBackReceiveBillList_BrushCard order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackReceiveBillList_BrushCard");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ string sql = "select * from h_v_SingOA_ErrMsgBackList_BrushCard order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_SingOA_ErrMsgBackList_BrushCard");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_SingOA_ErrMsgBackList_BrushCard where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_SingOA_ErrMsgBackList_BrushCard");
+ }
}
- else
+ else //鍘熸湁鐨勫埛鍗＄鍒拌幏鍙栨暟鎹�
{
- string sql1 = "select * from h_v_OA_ErrMsgBackReceiveBillList_BrushCard where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackReceiveBillList_BrushCard");
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ string sql = "select * from h_v_OA_ErrMsgBackReceiveBillList_BrushCard order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackReceiveBillList_BrushCard");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_OA_ErrMsgBackReceiveBillList_BrushCard where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackReceiveBillList_BrushCard");
+ }
+ }
}
+
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2925,7 +2946,7 @@
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- _ = SendDingDingAsync(oBill.omodel.HSendMan, 1, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
+ _ = SendDingDingAsync(oBill.omodel.HSendMan, 2, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
}
else if (refSav == "Update")
{
@@ -6653,7 +6674,7 @@
}
- if (HHandleEmpID==0) //寮傚父鍙嶉楠屾敹鍗曚繚瀛� 灏嗘秷鎭� 鍙戦�佺粰 鎺ユ敹浜猴紝鎸囨淳澶勭悊浜猴紝鍏ㄩ儴鎶勯�佷汉
+ if (HHandleEmpID==0) //
{
string HReceiveMan = HSendMan;
string[] names = HCopyMan.Split(',');
@@ -6674,13 +6695,14 @@
}
concatenatedNames = string.Join(",", HNames);
+ HDescription = HDescription + "--宸查獙鏀�";
}
- else if (HHandleEmpID==1)//寮傚父鍙嶉绛惧埌鍗�,寮傚父鍙嶉澶勭悊鍗� 灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
+ else if (HHandleEmpID==1)//寮傚父鍙嶉澶勭悊鍗� 灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
{
//鑾峰彇鍙戦�佷汉 鎺ユ敹浜�
string HReceiveMan = HCopyMan;
string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
- ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+ ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
List<string> HNames = new List<string>();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
@@ -6689,16 +6711,13 @@
}
concatenatedNames = string.Join(",", HNames);
+ HDescription = HDescription + "--宸茬鍒�";
}
- else
+ else if (HHandleEmpID == 2)//寮傚父鍙嶉澶勭悊鍗� 灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
{
- //鏌ヨ鎸囨淳澶勭悊浜�
- string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
- ds = oCN.RunProcReturn(sql, "Gy_Employee");
- string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
- //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
- string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
- LogService.CustomWriteLog("10鍙傛暟" + sql1, "寮傚父缃氭");
+ //鑾峰彇鍙戦�佷汉 鎺ユ敹浜�
+ string HReceiveMan = HCopyMan;
+ string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
List<string> HNames = new List<string>();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -6708,7 +6727,26 @@
}
concatenatedNames = string.Join(",", HNames);
- LogService.CustomWriteLog("9鍙傛暟" + concatenatedNames, "寮傚父缃氭");
+ HDescription = HDescription + "--宸插鐞�";
+ }
+ else
+ {
+ //鏌ヨ鎸囨淳澶勭悊浜�
+ string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_Employee");
+ string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
+ //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
+ string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
+ ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+ List<string> HNames = new List<string>();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ string HName = ds.Tables[0].Rows[i]["閽夐拤id"].ToString();
+ HNames.Add(HName);
+
+ }
+ concatenatedNames = string.Join(",", HNames);
+ HDescription = HDescription + "--宸叉帴鏀�";
}
//鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
@@ -6733,13 +6771,21 @@
[Route("Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery")]
[HttpGet]
- public object GetSc_MESTransFerWorkBillQuery(string user)
+ public object GetSc_MESTransFerWorkBillQuery(string sWhere, string user)
{
try
{
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HStatus = dic["HStatus"].ToString();//鏃堕棿鐘舵��
+ string HBeginDate = dic["HBeginDate"].ToString();//寮�濮嬫棩鏈�
+ string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
+ string HSourceID = dic["HSourceID"].ToString();//鐢熶骇璧勬簮
+
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery " + user, "h_p_OA_ErrMsgBackSelfQuery");
+ 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)
{
@@ -6788,7 +6834,8 @@
{
List<object> columnNameList = new List<object>();
- string sql = "select a.HSourceBillNo 娴佽浆鍗″彿,a.HSourceBillType 娴佽浆鍗＄被鍨�,a.HSourceInterID 娴佽浆鍗′富鍐呯爜,a.HSourceEntryID 娴佽浆鍗″瓙鍐呯爜,b.HNumber 鐗╂枡浠ｇ爜,b.HName 鐗╂枡鍚嶇О,b.HModel 瑙勬牸鍨嬪彿,a.HPlanQty 璁″垝鏁伴噺 from Sc_ICMOBillStatus_Tmp a left join Gy_Material b on a.HMaterID=b.HItemID where HSourceBillNo='" + HSourceBill + "'";
+ 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 + "'";
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
//娣诲姞鍒楀悕
@@ -6870,19 +6917,13 @@
string sql = "select a.Czymc 鐢ㄦ埛鍚嶇О,c.GroupName 鑱屽姟 from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc = '"+HName+"'";
ds = oCN.RunProcReturn(sql, "Gy_ErrMsgBackType");
string Job = ds.Tables[0].Rows[0]["鑱屽姟"].ToString();
- if (Job=="娉ㄥ鐝粍闀�" || Job=="鍚庡鐞嗙彮缁勯暱")
- {
- //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓嬬骇,缁欏彂閫佷汉榛樿涓虹彮缁勯暱涔嬩笅
- string sql1 = "select * from Gy_Duty where HParentID =(select HItemID from Gy_Duty group by HItemID, HName having HName = '"+Job+"' and count(*) = 1)";
- ds = oCN.RunProcReturn(sql1, "Gy_Duty");
- }
- else
- {
- //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓婄骇
- string sql2 = "select * from Gy_Duty where HItemID =(select HParentID from Gy_Duty group by HParentID, HName having HName = '" + Job + "' and count(*) = 1)";
- ds = oCN.RunProcReturn(sql2, "Gy_Duty");
- }
+
+ //鏍规嵁鑱屽姟鎵惧埌浠栫殑涓婄骇,缁欏彂閫佷汉榛樿涓哄綋鍓嶇櫥褰曚汉
+ string sql1 = "select * from Gy_Duty where HItemID =(select HParentID from Gy_Duty group by HParentID, HName having HName = '" + Job + "' and count(*) = 1))";
+ ds = oCN.RunProcReturn(sql1, "Gy_Duty");
+
string Job1= ds.Tables[0].Rows[0]["HName"].ToString();
+
//鐢ㄨ亴鍔℃壘鍒扮敤鎴�
string sql3 = "select a.Czymc 鐢ㄦ埛鍚嶇О,c.GroupName 鑱屽姟 from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId left join System_UserGroup c on b.GroupId = c.GroupID where c.GroupName = '" + Job1+"'";
ds = oCN.RunProcReturn(sql3, "Gy_Czygl");
--
Gitblit v1.9.1