1

duhe

2025-01-10 90c30b1cee537ffe0ce22b421cea93538c29a2c6

 WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs

@@ -463,10 +463,10 @@
        }
        #endregion

        #region 校验项目列表 文件上传
        [Route("Gy_QCCheckClass/Gy_Process_Excel")]
        #region 校验项目分类列表 文件上传
        [Route("Gy_QCCheckClass/Gy_QCCheckClass_Excel")]
        [HttpPost]
        public json Gy_Process_Excel()
        public json Gy_QCCheckClass_Excel()
        {
            json res = new json();
            try
@@ -492,7 +492,8 @@
                {
                    provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }

                //模板缺少列 但需要从数据库中查询出来显示在页面的字段
                provisional.Columns.Add("HOrgID", typeof(Int32));//组织ID
                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
@@ -517,12 +518,39 @@

                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 HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["助记码"]);
                    string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["备注"].ToString());
                    string HQCCheckClassName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["检验项目分类"].ToString());
                    string HQCCheckClassNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["检验项目分类代码"].ToString());
                    string HORGNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["组织代码"].ToString());
                    string HORGName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["组织名称"].ToString());
                    //获取真实行数
                    int line = i + 1;
                    if (HORGNumber != "")
                    {
                        //查询组织
                        ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where  HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            res.code = "0";
                            res.count = 0;
                            res.Message = "第" + line + "行,组织不存在！";
                            res.data = null;
                            return res;
                        }
                        else
                        {
                            provisional.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    }
                    else
                    {
                        res.code = CodeConstant.FAIL;
                        res.count = CountConstant.FAIL;
                        res.Message = "第" + line + "行,组织代码为空";
                        res.data = null;
                        return res;
                    }
                }

                res.code = "1";
@@ -551,17 +579,29 @@
            var error = "";

            //查询没有的列
            if (!provisional.Columns.Contains("代码"))
                error += "没有找到【代码】的标题,";
            if (!provisional.Columns.Contains("组织代码"))
                error += "没有找到【组织代码】的标题,";

            if (!provisional.Columns.Contains("名称"))
                error += "没有找到【名称】的标题,";
            if(!provisional.Columns.Contains("检验项目分类代码"))
                error += "没有找到【检验项目分类代码】的标题,";

            if (!provisional.Columns.Contains("组织名称"))
                error += "没有找到【组织名称】的标题,";

            if (!provisional.Columns.Contains("检验项目分类"))
                error += "没有找到【检验项目分类】的标题,";

            if (!provisional.Columns.Contains("助记码"))
                error += "没有找到【助记码】的标题,";

            if (!provisional.Columns.Contains("备注"))
                error += "没有找到【备注】的标题,";
            return error;
        }
        #endregion

        #region 校验项目列表 导入(保存)
        [Route("Gy_QCCheckClass/Gy_Process_btnSave")]
        #region 校验项目分类列表 导入(保存)
        [Route("Gy_QCCheckClass/Gy_QCCheckClass_btnSave")]
        [HttpPost]
        public object Gy_Group_btnSave([FromBody] JObject sMainSub)
        {
@@ -573,7 +613,7 @@
            string organ = sArray[2].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -599,8 +639,9 @@
                int i = 1;
                foreach (Dictionary<string, string> item in list)
                {
                    string HNumber = item["代码"].ToString();
                    string HName = item["名称"].ToString();
                    string HNumber = item["检验项目分类代码"].ToString();
                    string HUSEORGID = item["HOrgID"].ToString();
                    string HName = item["检验项目分类"].ToString();
                    string HHelpCode = item["助记码"];
                    string HRemark = item["备注"].ToString();

@@ -633,12 +674,12 @@
                    {

                        string sql = "insert into Gy_QCCheckClass (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
                            $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '未使用', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
                            $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '未使用', '{HUSEORGID}', '{HUSEORGID}', '{System.DateTime.Now.ToString("G")}', '{user}')";
                        oCN.RunProc(sql);
                    }
                    else
                    {
                        oCN.RunProc("update  Gy_QCCheckClass  set  HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
                        oCN.RunProc("update  Gy_QCCheckClass  set  HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "',HUSEORGID="+ HUSEORGID + ",HRemark='"+HRemark+"' where HNumber='" + HNumber + "'");
                    }

                    i++;