From da1bf9f968a95b773b0dff98b45197dc80c7ae63 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 六月 2024 16:24:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 3f55bdf..0d3a324 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -159,7 +159,16 @@
//string[] arrStr = oItem.HSendMan.Split(','); //鍙戦�佷汉
//arrStr = oItem.HReceiveMan.Split(','); //鎺ユ敹浜�
- string[] arrStr = oItem.HCopyMan.Split(','); //鎶勯�佷汉
+ string[] arrStr;
+
+ if (string.IsNullOrEmpty(oItem.HCopyMan))
+ {
+ arrStr = new string[0]; // 濡傛灉 oItem.HCopyMan 涓虹┖锛屽垯璧嬪�间负绌烘暟缁�
+ }
+ else
+ {
+ arrStr = oItem.HCopyMan.Split(','); // 鍚﹀垯锛屼娇鐢� Split(',') 鏂规硶鎷嗗垎瀛楃涓�
+ }
List<string> b = new List<string>(arrStr);
b.Add(oItem.HSendMan);
b.Add(oItem.HReceiveMan);
@@ -176,6 +185,7 @@
}
oBill.DetailColl2.Add(sb);
}
+
oBill.omodel = oItem;
}
@@ -185,7 +195,7 @@
bool bResult;
if (refSav == "Add")
{
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
if (bResult)
{
objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
@@ -201,9 +211,8 @@
{
objJsonResult.Verify = "N";
}
- }
- }
- SaveOA_ErrMsgBackBillSub(msg2);//绗竴娆′繚瀛樺彂閫侀拤閽�
+ }
+ }
}
else
@@ -522,7 +531,7 @@
A.HQty,A.HSendType,
A.HDeptID,D.HName HDeptName, A.HSendMan,
A.HReceiveMan,A.HCopyMan,A.HHasten,
- A.HLevel,A.HMaterName,A.HMaterModel,
+ 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,
A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType,
A.HHandleEmpID,f.HName HHandleEmpName
@@ -6597,56 +6606,56 @@
#endregion
- #region 寮傚父鍙嶉鍗曚繚瀛樺悗,寰�瀛愯〃閲岄潰鍘绘彃鍏ユ暟鎹�
- public object SaveOA_ErrMsgBackBillSub(string msg2)
+
+
+ #region 寮傚父鍙嶉鍗曟煡璇紙鎺ユ敹鐨勶紝鍙戦�佺殑锛屾妱閫佺殑锛�
+
+ [Route("Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery")]
+ [HttpGet]
+ public object GetSc_MESTransFerWorkBillQuery(string user)
{
- msg2 = "[" + msg2.ToString() + "]";
- List<ClsOA_ErrMsgBackBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsOA_ErrMsgBackBillMain>>(msg2);
+ try
+ {
+ List<object> columnNameList = new List<object>();
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HReceiveMan = mainList[0].HReceiveMan;//鎺ユ敹浜�
- string HDescription = mainList[0].HDescription;//鍐呭
- int HEntryID = 1;
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery " + user, "h_p_OA_ErrMsgBackSelfQuery");
- string sql = "insert into OA_ErrMsgBackBillSub2 values('" + HInterID + "','" + HEntryID + "','" + HReceiveMan + "','0')";
- oCN.RunProcReturn(sql, "OA_ErrMsgBackBillSub2");
- //鐩存帴鍙戦�侀拤閽夋秷鎭� s
- FistDingDingMesAsync(HReceiveMan, HDescription);
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ 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;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎻掑叆鎴愬姛,寮�濮嬫墽琛屽畾鏃朵换鍔�,閽夐拤鍙戦�佹秷鎭�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
-
- /// <summary>
- /// 寮傚父鍙嶉鍗曠涓�娆′繚瀛樼殑鏃跺�欒繘琛屽彂閫佹秷鎭�
- /// </summary>
- /// <param name="HReceiveMan"></param>
- /// <param name="HDescription"></param>
- public async void FistDingDingMesAsync(string HReceiveMan, string HDescription)
- {
-
- ds = oCN.RunProcReturn("select * from Gy_Czygl where Czymc='" + HReceiveMan + "'", "Gy_Czygl");
- string DDUserID = ds.Tables[0].Rows[0]["DDUserID"].ToString(); //閽夐拤鐢ㄦ埛鐨刬d
- Cls_DDMsg msg = new Cls_DDMsg();
- string appKey = "dingrsrzhdyn3mlaof95";
- string appSecret = "RAqH6YtZnPLCpDbuqfaYQkKkVtVdS0wqfC8I26X6qiS-8eoCJCNrzx3fubGND4Sq";
- //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
- string response = msg.GetAccessToken(appKey, appSecret);
- JObject responseJson = JObject.Parse(response);
- // 鑾峰彇access_token鐨勫��
- string accessToken = responseJson["accessToken"].ToString();
- //璋冪敤鏂规硶鍙戦�佹秷鎭�
- string agentId = "3118119317"; //浼佷笟鍐呴儴灏忕▼搴廼d
- string deptIdList = "0"; // 绌哄瓧绗︿覆琛ㄧず涓嶆寚瀹氶儴闂�
- string toAllUser = "false";
- string message = HDescription;//寮傚父鍙嶉鍗曠殑鍐呭
- response = await msg.SendTextMessage(accessToken, agentId, DDUserID, deptIdList, toAllUser, message);
- Console.WriteLine($"鍒濆娑堟伅鍙戦�佺粨鏋�: {response}");
- }
-
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1