合并

ch

2022-06-28 93b9f26c4581fa9d39f064a453fc21a67d582152

 WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs

@@ -26,36 +26,47 @@
        /// </summary>
        [Route("Gy_WorkCenter/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
                    ds = oCN.RunProcReturn("select * from h_v_WorkCenterList order by 工作中心代码 ", "h_v_WorkCenterList");
                }
                else
                {
                    string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by 工作中心代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
                }
                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;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -149,15 +160,16 @@
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
                long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
                long HItemID = list[0].HItemID ;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;   
                string HShortNumber = list[0].HShortNumber;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag=="True"?"1":"0";
                bool HStopflag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                var HWorkTimes = list[0].HWorkTimes;
                var HQty = list[0].HQty;
@@ -184,7 +196,7 @@
                   ",HDeptNumber,HWorkTimes,HQty" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
                   ",HProcID,HDayMoney) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HItemID.ToString() +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                   ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
                   ",'" + HLevel.ToString() + "'," + HEndFlag + "," + HStopflag +
                   ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "','" + HProcID + "'," + HDayMoney + ")";
@@ -212,47 +224,71 @@
            }
        }
        /// <summary>
        /// 修改单据-保存按钮
        /// 保存按钮
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_WorkCenter/EditBill")]
        [Route("Gy_WorkCenter/ModifyByID")]
        [HttpPost]
        public object EditBill([FromBody] JObject oMain)
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string msg3 = _value.ToString();
                string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg1 = sArray[0].ToString();
                string msg2 = sArray[1].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();

                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无编辑权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //反序列化
                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;
                string HShortNumber = list[0].HShortNumber;
                string HDeptNumber = list[0].HDeptNumber;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
                bool HStopflag = list[0].HStopflag;
                bool HEndFlag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                var HQty = list[0].HQty;
                var HBarCodeForBase = list[0].HBarCodeForBase;
                var HDayMoney = list[0].HDayMoney;
                var HDeptID = list[0].HDeptID;
                var HProcID = list[0].HProcID;
                var HLevel = list[0].HLevel;
                var HWorkTimes = list[0].HWorkTimes;
                int HUSEORGID = list[0].HUSEORGID;

                //判断权限
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
@@ -261,6 +297,7 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
@@ -269,31 +306,52 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Update Gy_WorkCenter set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HHelpCode='" + HHelpCode + "'" +
                    ",HParentID=" + HParentID +
                    ",HStopflag='" + HStopflag + "'" +
                    ",HRemark= '" + HRemark + "'"+
                    ",HDeptID=" + HDeptID +
                    ",HQty=" + HQty +
                    ",HWorkTimes=" + HWorkTimes +
                    ",HBarCodeForBase='" + HBarCodeForBase + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
                oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCN.Commit();
                objJsonResult.code = "1";
                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into  Gy_WorkCenter " +
                   " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                   ",HDeptNumber,HWorkTimes,HQty" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
                   ",HProcID,HDayMoney,HUSEORGID) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    oCN.RunProc("Update Gy_WorkCenter set " +
                                  " HNumber='" + HNumber + "'" +
                                  ",HName='" + HName + "'" +
                                  ",HShortNumber='" + HShortNumber + "'" +
                                  ",HHelpCode='" + HHelpCode + "'" +
                                  ",HParentID=" + HParentID +
                                  ",HStopflag='" + HStopflag + "'" +
                                  ",HRemark= '" + HRemark + "'" +
                                  ",HDeptID=" + HDeptID +
                                  ",HQty=" + HQty +
                                  ",HWorkTimes=" + HWorkTimes +
                                  ",HBarCodeForBase='" + HBarCodeForBase + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 为非末级
                    oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改单据成功！";
                //objJsonResult.data = null;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
@@ -306,28 +364,122 @@
                return objJsonResult;
            }
        }
        ///// <summary>
        ///// 修改单据-保存按钮
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Gy_WorkCenter/EditBill")]
        //[HttpPost]
        //public object EditBill([FromBody] JObject oMain)
        //{
        //    try
        //    {
        //        var _value = oMain["oMain"].ToString();
        //        string msg1 = _value.ToString();
        //        //反序列化
        //        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;
        //string HHelpCode = list[0].HHelpCode;
        //string HRemark = list[0].HRemark;
        //string HStopflag = list[0].HStopflag;
        //string HUseFlag = list[0].HUseFlag;
        //var HQty = list[0].HQty;
        //var HBarCodeForBase = list[0].HBarCodeForBase;
        //var HDayMoney = list[0].HDayMoney;
        //var HDeptID = list[0].HDeptID;
        //var HWorkTimes = list[0].HWorkTimes;

        //        //判断权限
        //        //if (!ClsPub.Security_Log(msg5, 1, false, 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();
        //        //主表
        //        oCN.RunProc("Update Gy_WorkCenter set " +
        //            " HNumber='" + HNumber + "'" +
        //            ",HName='" + HName + "'" +
        //            ",HShortNumber='" + HShortNumber + "'" +
        //            ",HHelpCode='" + HHelpCode + "'" +
        //            ",HParentID=" + HParentID +
        //            ",HStopflag='" + HStopflag + "'" +
        //            ",HRemark= '" + HRemark + "'"+
        //            ",HDeptID=" + HDeptID +
        //            ",HQty=" + HQty +
        //            ",HWorkTimes=" + HWorkTimes +
        //            ",HBarCodeForBase='" + HBarCodeForBase + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
        //        //修改子项目代码
        //        //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
        //        //将上级 为非末级
        //        oCN.RunProc("Update Gy_WorkCenter 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>
        /// 工作中心删除功能
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_WorkCenter")]
        [HttpGet]
        public object DeltetGy_WorkCenter(string HItemID)
        public object DeltetGy_WorkCenter(string HItemID,string user)
        {
            DataSet ds;
            DataSet ds1;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
@@ -438,7 +590,7 @@
            DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;