异常反馈单，快捷开工接口调整

wtt

4 天以前 5466e02176f2acf2f08ef1c16315c3185bae903f

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -65,24 +65,24 @@
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds.Tables[0].Rows.Count > 0 && ds != null)
                {
                //if (ds.Tables[0].Rows.Count > 0 && ds != null)
                //{
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查询到部门数据，请联系系统管理员进行核对";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                //}
                //else
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有查询到部门数据，请联系系统管理员进行核对";
                //    objJsonResult.data = ds.Tables[0];
                //    objJsonResult.list = columnNameList;
                //    return objJsonResult;
                //}

               
            }
@@ -177,37 +177,7 @@
            }

        }
        #endregion


        #region 设备分布 生产资源对应的订单 

        [Route("Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce")]
        [HttpGet]
        public object Sc_OrderStateDistribution_Souce(string sWhere,string user,int OrganizationID)
        {
            try
            {
                string sql1 = string.Format("exec h_p_sc_HDeptSouceMOList {0},{1}", sWhere, OrganizationID);

                ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptSouceMOList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #endregion    

        /// <summary>
        /// 根据基础资料ID 查找记录
@@ -552,6 +522,8 @@
                //DateTime HCheckDate = list[0].HCheckDate;
                string HDeleteMan = list[0].HDeleteMan;
                //DateTime HDeleteDate = list[0].HDeleteDate;
                bool HWorkShopFlag = list[0].HWorkShopFlag;
                long HEmpQtys = list[0].HEmpQtys;
                //末级标志
                bool HEndFlag = true;
                long HEntityID = 1;
@@ -592,7 +564,7 @@
                        return objJsonResult;
                    }
                }
              

                //判断权限
                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                //{
@@ -621,7 +593,17 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //查询数据中是否存在重复代码
                ds = oCN.RunProcReturn("Select HItemID from Gy_Department  Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUseOrgID, "Gy_Warehouse");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //保存
                //保存完毕后处理
                if (HItemID == 0)
@@ -630,10 +612,10 @@
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_Department " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime,HWorkShopFlag,HEmpQtys) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
                        "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
                        "," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate(),"+ Convert.ToString(HWorkShopFlag ? 1 : 0) + ","+ HEmpQtys + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -641,6 +623,19 @@
                else
                {
                    oCN.BeginTran();
                    //已审核不允许修改
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Warehouse");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态已经审核，不允许修改！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //主表
                    oCN.RunProc("Update Gy_Department set " +
                        " HNumber='" + HNumber + "'" +
@@ -656,6 +651,8 @@
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HUpDater='" + HUpDater + "'" +
                        ",HUpDateDate= getdate()" +
                        ",HWorkShopFlag=" + Convert.ToString(HWorkShopFlag ? 1 : 0) +
                        ",HEmpQtys=" + HEmpQtys.ToString() +
                        ",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);
@@ -1166,95 +1163,95 @@
        #endregion

        #region 部门列表 文件上传
        [Route("Gy_Department/Gy_Process_Excel")]
        [HttpPost]
        public json Gy_Department_Excel()
        {
            json res = new json();
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);
        //[Route("Gy_Department/Gy_Process_Excel")]
        //[HttpPost]
        //public json Gy_Department_Excel()
        //{
        //    json res = new json();
        //    try
        //    {
        //        //获取文件名称
        //        var file = HttpContext.Current.Request.Files[0];
        //        //获取文件物理路径
        //        string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
        //        //保存文件
        //        file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
        //        NpoiHelper np = new NpoiHelper();
        //        DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);
        //        //删除文件
        //        File.Delete(ExcelPath);

                //创建临时表
                DataTable provisional = new DataTable("dt2");
        //        //创建临时表
        //        DataTable provisional = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }
        //        //添加列名
        //        for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
        //        {
        //            provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
        //        }

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = provisional.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    provisional.Rows.Add(row);
                }
        //        //添加数据
        //        for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
        //        {
        //            DataRow row = provisional.NewRow();
        //            for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
        //            {
        //                row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
        //            }
        //            provisional.Rows.Add(row);
        //        }

                //判断列
                string error = JudgmentColumns(provisional);
                if (error.Length > 0)
                {
                    res.code = "0";
                    res.count = 0;
                    res.Message = $"Excel模板存在错误,{error}\r\n";
                    res.data = null;
                    return res;
                }
        //        //判断列
        //        string error = JudgmentColumns(provisional);
        //        if (error.Length > 0)
        //        {
        //            res.code = "0";
        //            res.count = 0;
        //            res.Message = $"Excel模板存在错误,{error}\r\n";
        //            res.data = null;
        //            return res;
        //        }

                for (int i = 0; i <= provisional.Rows.Count - 1; i++)
                {
                    string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门代码"].ToString());
                    string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门名称"].ToString());
                    string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人代码"].ToString());
                    string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人名称"].ToString());
                    string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["条形码"].ToString());
                    string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
                    string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
        //        for (int i = 0; i <= provisional.Rows.Count - 1; i++)
        //        {
        //            string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门代码"].ToString());
        //            string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["部门名称"].ToString());
        //            string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人代码"].ToString());
        //            string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["负责人名称"].ToString());
        //            string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["条形码"].ToString());
        //            string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
        //            string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());

                    //判断负责人是否存在
                    if (JudgeEmp(HEmpNumber, HEmpName))
                    {
                        res.code = CodeConstant.FAIL;
                        res.count = CountConstant.FAIL;
                        res.Message = "当前职员不存在";
                        res.data = null;
                        return res;
                    }
                    //获取真实行数
                    int line = i + 1;
                }
        //            //判断负责人是否存在
        //            if (JudgeEmp(HEmpNumber, HEmpName))
        //            {
        //                res.code = CodeConstant.FAIL;
        //                res.count = CountConstant.FAIL;
        //                res.Message = "当前职员不存在";
        //                res.data = null;
        //                return res;
        //            }
        //            //获取真实行数
        //            int line = i + 1;
        //        }

                res.code = "1";
                res.count = 1;
                res.Message = error;
                res.data = provisional;
                return res;
            }
            catch (Exception e)
            {
                res.code = "0";
                res.count = 0;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return res;
            }
        }
        //        res.code = "1";
        //        res.count = 1;
        //        res.Message = error;
        //        res.data = provisional;
        //        return res;
        //    }
        //    catch (Exception e)
        //    {
        //        res.code = "0";
        //        res.count = 0;
        //        res.Message = "Exception！" + e.ToString();
        //        res.data = null;
        //        return res;
        //    }
        //}

        /// <summary>
        /// 判断当前职员是否存在
@@ -1262,15 +1259,15 @@
        /// <param name="HEmpNumber"></param>
        /// <param name="HEmpName"></param>
        /// <returns></returns>
        private bool JudgeEmp(string HEmpNumber, string HEmpName)
        {
            if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
            {
                DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
                return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
            }
            return false;
        }
        //private bool JudgeEmp(string HEmpNumber, string HEmpName)
        //{
        //    if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
        //    {
        //        DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
        //        return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
        //    }
        //    return false;
        //}

        /// <summary>
        /// 判断列