From b27cc0c7af4cb9f5b404c95f90c63be22668d0a6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 08 十月 2022 08:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/Employee.cs | 30 ++++++++++
WebAPI/ListModels.cs | 12 ++++
WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 2
WebAPI/Controllers/BLL/Xt_UserController.cs | 82 +++++++++++++++++++++++++++
WebAPI/WebAPI.csproj.user | 2
WebAPI/WebAPI.csproj | 1
6 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index e04db05..38d1af4 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -770,5 +770,87 @@
}
}
#endregion
+
+ #region 鏍规嵁鐢ㄦ埛缂栫爜鏌ユ壘宸插垎閰嶈亴鍛樺垪琛�
+ [Route("Xt_User/UserEmployeelistPlaylist")]
+ [HttpGet]
+ public object UserEmployeelistPlaylist(string HUserID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select HEmployeeID HItemID,鑱屽憳浠ｇ爜 HNumber,鑱屽憳鍚嶇О HName from h_v_Gy_UserEmployeeRelationList where HUserID='" + HUserID + "' ", "h_v_Gy_UserEmployeeRelationList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺亴鍛樹俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢ㄦ埛鍏宠仈鑱屽憳淇濆瓨
+ [Route("Xt_User/SaveUserEmployee")]
+ [HttpPost]
+ public object SaveUserEmployee([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ List<Models.Employee> lsmain = new List<Models.Employee>();
+ msg2 = msg2.Substring(1, msg2.Length - 2);
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Employee(msg2);
+ oCN.BeginTran();
+ //鍒犻櫎宸茬粡鍏宠仈鐨勬暟鎹�
+ oCN.RunProc("Delete From Gy_UserEmployeeRelation where HUserID='" + msg3.ToString() + "'");
+ foreach (Models.Employee oItem in lsmain)
+ {
+ //閲嶆柊鍐欏叆鍏宠仈鏁版嵁
+ oCN.RunProc("insert into Gy_UserEmployeeRelation (HEmployeeID,HUserID) values ('" + oItem.HItemID + "','" + msg3.ToString() + "')");
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 0842f66..96bdf0b 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1842,6 +1842,18 @@
}
/// <summary>
+ /// 鐢ㄦ埛鑱屽憳鍏崇郴淇℃伅琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.Employee> getObjectByJson_Employee(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Employee>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 鍏憡鍒楄〃涓昏〃鐨刯son
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 3126a6b..c8c90af 100644
--- a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -64,7 +64,7 @@
public Int64 HMaterID; //物料内码（gy_material）
-
+ public int HOrgID; //组织ID
}
}
diff --git a/WebAPI/Models/Employee.cs b/WebAPI/Models/Employee.cs
new file mode 100644
index 0000000..fdf9889
--- /dev/null
+++ b/WebAPI/Models/Employee.cs
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Employee
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+ public string HRemark { get; set; }
+ public string HUseFlag { get; set; }
+ public long HParentID { get; set; }
+ public string HBarCode { get; set; }
+ public long HSecManagerID { get; set; }
+ public long HCreateOrgID { get; set; }
+ public long HUseOrgID { get; set; }
+ public string HHelpCode { get; set; }
+ public string HCreator { get; set; }
+ public bool HStopflag { get; set; }
+ public Int64 HDeptID { get; set; }
+ public string HDeptName { get; set; }
+ public string HUpDater { get; set; }
+ public string HChecker { get; set; }
+ public string HDeleteMan { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9ff0179..d3e9070 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -558,6 +558,7 @@
<Compile Include="Models\ClsGy_MateMould.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
+ <Compile Include="Models\Employee.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3179f3..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1