Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-10-08 b27cc0c7af4cb9f5b404c95f90c63be22668d0a6

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 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
    }
}

 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>
        /// 公告列表主表的json
        /// </summary>
        /// <param name="jsonString"></param>

 WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs

@@ -64,7 +64,7 @@
     

        public Int64 HMaterID;  //物料内码（gy_material）

        public int HOrgID; //组织ID

    }
}

 WebAPI/Models/Employee.cs

New file
@@ -0,0 +1,30 @@
using 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; }
    }
}

 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" />

 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 />