From 8c4c95cd4d1e984d00f2ef6a5ddab53ba2f323f6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 02 七月 2024 14:33:20 +0800
Subject: [PATCH] 添加用户关联部门列表接口
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 66a1b09..0d3a324 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -1,4 +1,6 @@
-锘縰sing DBUtility;
+锘縰sing DAL;
+using DBUtility;
+using DLL;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -7,8 +9,11 @@
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Timers;
+using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.Models;
+using System.Threading;
namespace WebAPI.Controllers.SCGL
{
@@ -43,7 +48,7 @@
/// <returns></returns>
[Route("Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom")]
[HttpPost]
- public object SaveGetMESTransFerWorkFrom([FromBody] JObject msg)
+ public object SaveGetMESTransFerWorkFromAsync([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
@@ -151,10 +156,19 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+
//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);
@@ -165,12 +179,13 @@
Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2();
sb.HEntryID = i;
sb.HReceiveMan = arrStr[i - 1];
- if (arrStr[i-1].ToString() == oItem.HSendMan)
+ if (arrStr[i - 1].ToString() == oItem.HSendMan)
{
sb.HReadFlag = true;
}
oBill.DetailColl2.Add(sb);
}
+
oBill.omodel = oItem;
}
@@ -180,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
@@ -196,8 +211,8 @@
{
objJsonResult.Verify = "N";
}
- }
- }
+ }
+ }
}
else
@@ -516,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
@@ -6590,5 +6605,57 @@
#endregion
#endregion
+
+
+
+ #region 寮傚父鍙嶉鍗曟煡璇紙鎺ユ敹鐨勶紝鍙戦�佺殑锛屾妱閫佺殑锛�
+
+ [Route("Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery")]
+ [HttpGet]
+ public object GetSc_MESTransFerWorkBillQuery(string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery " + user, "h_p_OA_ErrMsgBackSelfQuery");
+
+ 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;
+ }
+
+ }
+ 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