沈泽
2021-08-20 d111e4321dcc4baa63f63597694f80d94e67ca11
新增工序保存、工作中心保存、班组保存方法
1个文件已添加
6个文件已修改
406 ■■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_GroupController.cs 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/基础资料/Gy_Process.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -20,7 +20,7 @@
        /// <summary>
        /// è¿”回工作中心列表
        /// è¿”回班组列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -79,7 +79,7 @@
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_GroupList where HitemID=" + HInterID, "h_v_GroupList");
                ds = oCN.RunProcReturn("select * from h_v_GroupListDetail where HitemID=" + HInterID, "h_v_GroupListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -220,22 +220,18 @@
        {
            try
            {
                DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
                long HItemID = int.Parse(msg3);
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
@@ -246,30 +242,30 @@
                var HProcID = list[0].HProcID;
                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oDept.HavSameNumber(HItemID, HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -288,7 +284,7 @@
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCN.Commit();
                objJsonResult.code = "1";
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -17,7 +17,143 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// ä¿®æ”¹å•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Process/EditBill")]
        [HttpPost]
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public object EditBill([FromBody] JObject oMain)
        {
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
                List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                bool HTypeFlow = list[0].HTypeFlow;
                bool HTypeCount = list[0].HTypeCount;
                string HDeptNumber = "";
                long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
                bool HEndFlag = false;
                long HProcessID_K3 = list[0].HProcessID_K3;
                string HBillSubType = list[0].HType;
                bool HAutoTrunFlag = list[0].HAutoTrunFlag;
                string HFixPrice = list[0].HFixPrice;
                string HOverFixPrice = list[0].HOverFixPrice;
                string HSNo = list[0].HSNo;
                string HBarCode = list[0].HBarCode;
                string HProcMulID = list[0].HProcMulID;
                string HProcCheckNote = list[0].HProcCheckNote;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                long HEmpQty = list[0].HEmpQty;
                string HBarCodeForBase = list[0].HBarCodeForBase;
                long HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                //判断权限
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                //主表
                //oCN.RunProc("Update Gy_Process set " +
                //    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                //    ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
                //    ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
                //    ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
                //    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                //    "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "'," + HSNo.ToString() +
                //    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
                //    ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
                //    "," + HFixPrice.ToString() + "," +HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                oCN.BeginTran();
                oCN.RunProc("Update Gy_Process set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HHelpCode='" + HHelpCode + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HParentID= " + HParentID +
                    ",HTypeFlow= '" + HTypeFlow + "'" +
                    ",HTypeCount= '" + HTypeCount + "'" +
                    ",HDeptNumber='" + HDeptNumber + "'" +
                    ",HSNo= " + HSNo +
                    ",HLevel= " + HLevel +
                    ",HEndFlag= '" + HEndFlag + "'" +
                    ",HStopflag= '" + HStopflag + "'" +
                    ",HRemark='" + HRemark + "'" +
                    ",HDeptID= " + HDeptID +
                    ",HBarCodeForBase='" + HBarCodeForBase + "'" +
                    ",HProcessID_K3= " + HProcessID_K3 +
                    ",HBillSubType='" + HBillSubType + "'" +
                    ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
                    ",HFixPrice= " + HFixPrice +
                    ",HOverFixPrice= " + HOverFixPrice +
                    ",HProcMulID= " + HProcMulID +
                    ",HProcCheckNote='" + HProcCheckNote + "'" +
                    " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //return true;
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                //oCN.RunProc("Update Gy_Group 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。
@@ -67,6 +203,45 @@
        }
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Process/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessListDetail where HitemID=" + HInterID, "h_v_Gy_ProcessListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    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;
            }
        }
        //
    }
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -17,56 +17,6 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// è¿”回部门列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/list")]
        [HttpGet]
        public object list(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    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;
            }
        }
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数:string sql。
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -222,22 +222,18 @@
        {
            try
            {
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
                long HItemID = int.Parse(msg3);
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
@@ -249,30 +245,30 @@
                var HWorkTimes = list[0].HWorkTimes;
                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oDept.HavSameNumber(HItemID, HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -311,7 +307,7 @@
            }
        }
        /// <summary>
        /// ç»´ä¿®åˆ—表修改按钮方法
        /// å·¥ä½œä¸­å¿ƒåˆ—表修改按钮方法
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -321,7 +317,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HInterID, "Gy_WorkCenter");
                ds = oCN.RunProcReturn("select a.*,b.HName HDeptName from Gy_WorkCenter a left join Gy_Department b on a.HDeptID = b.HItemID where a.HItemID=" + HInterID, "Gy_WorkCenter");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Process.cs
New file
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Gy_Process
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }       // ä»£ç 
        public string HName { get; set; }         //
        public string HHelpCode { get; set; }      //助记码
        public string HShortNumber { get; set; }   //短代码
        public bool HEndFlag { get; set; }      //末级标志
        public bool HStopflag { get; set; }     //禁用标志
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志
        public long HParentID { get; set; }      //父级ID
        public bool HTypeFlow { get; set; }
        public bool HTypeCount { get; set; }
        public string HDeptNumber { get; set; }
        public string HBarCode { get; set; }
        public string HLevel { get; set; }
        public long HProcessID_K3 { get; set; }
        public string HType { get; set; }
        public bool HAutoTrunFlag { get; set; }
        public string HFixPrice { get; set; }
        public string HOverFixPrice { get; set; }
        public string HSNo { get; set; }
        public string HProcMulID { get; set; }
        public string HProcCheckNote { get; set; }
        public long HDeptID { get; set; }
        public long HEmpQty { get; set; }
        public long HProcID { get; set; }
        public string HBarCodeForBase { get; set; }
    }
}
WebAPI/WebAPI.csproj
@@ -459,6 +459,7 @@
    <Compile Include="Models\WWSendOutBillViewModel.cs" />
    <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
    <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
    <Compile Include="Models\基础资料\Gy_Process.cs" />
    <Compile Include="Models\基础资料\Warehouse.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />