ch
2021-04-25 7208ffe65e1d67646dde1a4153f5fa6b9fcc9273
部门基础资料 新增 修改 删除  禁用 反禁用  功能
6个文件已修改
1个文件已添加
347 ■■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs 285 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Department.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/API.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebServer.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -66,35 +66,25 @@
            }
        }
        /// <summary>
        /// 部门列表删除按钮
        /// 根据基础资料ID 查找记录
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/Delete_Json")]
        [Route("Gy_Department/cx")]
        [HttpGet]
        public object Delete_Json(string HNumber,string HName)
        public object cx(long HInterID)
        {
            try
            {
                    ds = oCN.RunProcReturn("delete from Gy_Department where HNmber =  " + HNumber + " and HName = " + HName , "Gy_Department");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                ds = oCN.RunProcReturn("select * from Gy_Department where hitemid =  " + HInterID, "Gy_Department");
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
@@ -106,6 +96,269 @@
            }
        }
        /// <summary>
        /// 部门列表删除按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/Delete_Json")]
        [HttpGet]
        public object Delete_Json(long HItemID)
        {
            try
            {
                ds = oCN.RunProcReturn("delete from Gy_Department where HItemID =  " + HItemID, "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                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;
            }
        }
        /// <summary>
        /// 部门列表禁用按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/JY_Json")]
        [HttpGet]
        public object JY_Json(long HItemID)
        {
            try
            {
                ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID =  " + HItemID, "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                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;
            }
        }
        /// <summary>
        /// 部门列表反禁用按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/FJY_Json")]
        [HttpGet]
        public object FJY_Json(long HItemID)
        {
            try
            {
                ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID =  " + HItemID, "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                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;
            }
        }
        /// <summary>
        /// 新增单据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/AddBill")]
        [HttpPost]
        public object AddBill([FromBody] JObject oMain)
        {
            try {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
                List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HShortNumber;
                string HRemark = list[0].HRemark;
                string HUseFlag = list[0].HUseFlag;
                long HParentID = list[0].HParentID;
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Insert Into Gy_Department " +
                "(HNumber,HShortNumber,HName,HParentID" +
                ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
                ") " +
                " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
                ",'',0,'" + HRemark + "',0,''" +
              ") ");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功!";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch(Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// 修改单据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/AddBill1")]
        [HttpPost]
        public object AddBill1([FromBody] JObject oMain)
        {
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[1].ToString();
                string msg3 = sArray[0].ToString();
                //反序列化
                msg3 = "[" + msg3.ToString() + "]";
                List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg3);
                long HItemID = int.Parse(msg2);
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HShortNumber;
                string HRemark = list[0].HRemark;
                string HUseFlag = list[0].HUseFlag;
                long HParentID = list[0].HParentID;
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Update Gy_Department set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HParentID=" + HParentID +
                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
                //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改单据成功!";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// 获取最大基础资料ID
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/GetMAXBillID")]
        [HttpGet]
        public object GetMAXBillID()
        {
            try
            {
                ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                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;
            }
        }
        /// <summary>
        /// 部门列表修改按钮方法
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/xg")]
        [HttpGet]
        public object xg(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                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;
            }
        }
        //
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -81,7 +81,7 @@
            string msg1 = _value.ToString();
            try
            {
                //委外工序发出反序列化
                //部门基础资料反序列化
                msg1 = "[" + msg1.ToString() + "]";
                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
WebAPI/ListModels.cs
@@ -224,5 +224,17 @@
            return list;
        }
        /// <summary>
        /// 处理新增部门基础资料的JSON
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_Department_Model> getObjectByJson_Depaetment(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_Department_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Department_Model>>(jsonString);
            return list;
        }
    }
}
WebAPI/Models/Department.cs
New file
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Department
    {
        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; }
    }
}
WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -164,10 +164,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/21/2021 15:18:36</publishTime>
      <publishTime>04/25/2021 08:39:33</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/21/2021 15:18:36</publishTime>
      <publishTime>04/25/2021 08:39:33</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -341,7 +341,7 @@
      <publishTime>04/12/2021 11:33:15</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/21/2021 15:18:46</publishTime>
      <publishTime>04/25/2021 08:39:37</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -358,6 +358,7 @@
    <Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
    <Compile Include="Models\Sc_ProcessReportViewModel.cs" />
    <Compile Include="Models\Sc_ProcessSendWorkViewModel.cs" />
    <Compile Include="Models\Department.cs" />
    <Compile Include="Models\StationBill.cs" />
    <Compile Include="Models\StationOutBillView.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
WebAPI/WebServer.cs
@@ -5224,18 +5224,21 @@
             DAL.Cls_S_IF_SellOutBill_Lite dal = new DAL.Cls_S_IF_SellOutBill_Lite();
             return dal.DisSourceBillList(sWhere);
         }
         #endregion
        #endregion
        #region   委外入库
         /// <summary>
         /// 生成委外入库单K3
         /// </summary>
         /// <param name="oMain"></param>
         /// <param name="sErrMsg"></param>
         /// <returns></returns>
         public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        /// <summary>
        /// 生成委外入库单K3
        /// </summary>
        /// <param name="oMain"></param>
        /// <param name="sErrMsg"></param>
        /// <returns></returns>
        public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
             SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             DAL.ClsKf_EntrustInBill dal = new DAL.ClsKf_EntrustInBill();