1.工序新增、修改、删除 2.订单同步接口、通用基础资料(仓库基本资料、工序基础资料、工单产品信息下拉查询) 3.ERP订单功能、MES工单查询、修改...

yl

2023-09-21 fd263cc1a5c0623972cd124ac6f3fe0fc1277e53

 VueWebCoreApi/Tools/ImportExcelData.cs

@@ -626,7 +626,7 @@
                Message = "设备类型模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[1].Columns.Count != 6)
            else if (excelTable[1].Columns.Count != 5)
            {
                code = "301";
                Message = "设备清单模板不符合规范,请检查列名字段数";
@@ -662,7 +662,7 @@
                Message = "设备清单模板：表头信息不符合规范,第2列应为{*设备名称}";
                return Message;
            }
            else if (excelTable[1].Columns[2].ColumnName != "所属组织编码")
            else if (excelTable[1].Columns[2].ColumnName != "*所属组织编码")
            {
                code = "301";
                Message = "设备清单模板：表头信息不符合规范,第3列应为{*所属组织编码}";
@@ -674,16 +674,10 @@
                Message = "设备清单模板：表头信息不符合规范,第4列应为{*设备类型编码}";
                return Message;
            }
            else if (excelTable[1].Columns[4].ColumnName != "*启用日期")
            else if (excelTable[1].Columns[4].ColumnName != "*状态")
            {
                code = "301";
                Message = "设备清单模板：表头信息不符合规范,第5列应为{*启用日期}";
                return Message;
            }
            else if (excelTable[1].Columns[5].ColumnName != "*状态")
            {
                code = "301";
                Message = "设备清单模板：表头信息不符合规范,第6列应为{*状态}";
                Message = "设备清单模板：表头信息不符合规范,第5列应为{*状态}";
                return Message;
            }
            else
@@ -1268,36 +1262,52 @@
        #endregion

        #region【Excel模板上传验证,工序定义模板】
        public static string Fifteen(string FileCode, out string code)
        public static string Fifteen(List<DataTable> excelTable, out string code)
        {
            string Message = "";
            code = "";
            DataTable excelTable = new DataTable();
            excelTable = ImportExcel.ExcelToTable(FileCode);
            if (excelTable.Columns.Count != 4)
            if (excelTable.Count != 1)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                code = "301";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;

            }
            else if (excelTable.Columns[0].ColumnName != "序号")
            else if (excelTable[0].Columns.Count != 5)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                code = "301";
                Message = "工序设置模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable.Columns[1].ColumnName != "工序编码(唯一)")
            else if (excelTable[0].Columns[0].ColumnName != "*工序编号(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                code = "301";
                Message = "工序设置模板：表头信息不符合规范,第1列应为{*工序编号(唯一)}";
                return Message;
            }
            else if (excelTable.Columns[2].ColumnName != "工序名称（唯一）")
            else if (excelTable[0].Columns[1].ColumnName != "*工序名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                code = "301";
                Message = "工序设置模板：表头信息不符合规范,第2列应为{*工序名称}";
                return Message;
            }
            else if (excelTable.Columns[3].ColumnName != "启用状态")
            else if (excelTable[0].Columns[2].ColumnName != "*工序类型")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                code = "301";
                Message = "工序设置模板：表头信息不符合规范,第3列应为{*工序类型}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "*状态")
            {
                code = "301";
                Message = "工序设置模板：表头信息不符合规范,第1列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[4].ColumnName != "描述")
            {
                code = "301";
                Message = "工序设置模板：表头信息不符合规范,第2列应为{描述}";
                return Message;
            }
            else
            {
@@ -3332,15 +3342,65 @@
        #endregion

        #region【Excel上传数据验证,工序定义】
        public static List<ExcelErro> FifteenData(string FileCode, out string StuCode, out string message, out int count)
        public static List<ExcelErro> FifteenData(List<DataTable> excelTable, out string StuCode, out string message, out int count)
        {
            message = "";
            StuCode = "";
            count = 0;
            string sql = "";
            var dynamicParams = new DynamicParameters();
            DataTable dt;
            List<ExcelErro> list = new List<ExcelErro>();

            list = ImportExcel.InportExcelToTableListErro(excelTable);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            //工序表
            for (int k = 0; k < excelTable[0].Rows.Count; k++)
            {
                if (excelTable[0].Rows[k][0].ToString().Trim() != null && excelTable[0].Rows[k][0].ToString().Trim() != "")
                {
                    sql = @"select *  from TStep where stepcode=@stepcode";
                    dynamicParams.Add("@stepcode", excelTable[0].Rows[k][0].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*工序编号(唯一)}";
                        erro.ErrorCont = "工序表:{*工序编号(唯一)}字段" + excelTable[0].Rows[k][0].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[0].Rows[k][1].ToString().Trim() != null && excelTable[0].Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TStep where stepname=@stepname";
                    dynamicParams.Add("@stepname", excelTable[0].Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*工序名称}";
                        erro.ErrorCont = "工序表:{*工序名称}字段" + excelTable[0].Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            if (list.Count > 0)
            {
                int index = 0;
                foreach (ExcelErro item in list)
                {
                    index++;
                    item.Seq = index.ToString();
                }
                StuCode = "301";
                message = "数据验证失败";
            }
            else
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable[0].Rows.Count;
            }
            return list;
        }
        #endregion
@@ -4408,15 +4468,15 @@
                            name = excelTable[0].Rows[k][1].ToString().Trim(),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString(),
                            idparent = excelTable[0].Rows[k][2].ToString().Trim()
                            remark = excelTable[0].Rows[k][2].ToString().Trim()
                        }
                    });
                }
                //导入设备
                for (int i = 0; i < excelTable[1].Rows.Count; i++)
                {
                    sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,input_date,operation_ration,enable,opc_uom,lm_user,lm_date) 
                            values(@code,@name,@torg_code,@eqptype_code,@input_date,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
                    sql = @"insert into TEqpInfo(code,name,torg_code,eqptype_code,operation_ration,enable,opc_uom,lm_user,lm_date) 
                            values(@code,@name,@torg_code,@eqptype_code,@operation_ration,@enable,@opc_uom,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
@@ -4426,9 +4486,8 @@
                            name = excelTable[1].Rows[i][1].ToString().Trim(),
                            torg_code = excelTable[1].Rows[i][2].ToString().Trim(),
                            eqptype_code = excelTable[1].Rows[i][3].ToString().Trim(),
                            input_date = excelTable[1].Rows[i][4].ToString().Trim(),
                            operation_ration = "100",
                            enable = excelTable[1].Rows[i][5].ToString().Trim(),
                            enable = excelTable[1].Rows[i][4].ToString().Trim(),
                            opc_uom = "台",
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
@@ -4859,13 +4918,47 @@
        #endregion

        #region【Excel数据上传,工序定义】
        public static string FifteenSubmit(string FileCode, string User, out string StuCode)
        public static string FifteenSubmit(List<DataTable> excelTable, User us, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {

                list.Clear();
                //导入工序
                for (int i = 0; i < excelTable[0].Rows.Count; i++)
                {
                    sql = @"insert into TStep(stepcode,stepname,enable,descr,flwtype,lm_user,lm_date) 
                            values(@stepcode,@stepname,@enable,@descr,@flwtype,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            stepcode = excelTable[0].Rows[i][0].ToString().Trim(),
                            stepname = excelTable[0].Rows[i][1].ToString().Trim(),
                            enable = excelTable[0].Rows[i][3].ToString().Trim(),
                            descr = excelTable[0].Rows[i][4].ToString().Trim(),
                            flwtype = excelTable[0].Rows[i][2].ToString().Trim(),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    StuCode = "200";
                    message = "导入成功！";
                }
                else
                {
                    StuCode = "300";
                    message = "导入失败！";
                }
            }
            catch (Exception e)
            {