1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改

yl

2023-10-18 37b39b9748eaaa7900271d83a94698299d53fed4

 VueWebCoreApi/Tools/ImportExcelData.cs

@@ -1045,7 +1045,7 @@
                return Message;

            }
            else if (excelTable[0].Columns.Count != 7)
            else if (excelTable[0].Columns.Count != 6)
            {
                code = "301";
                Message = "模具清单模板不符合规范,请检查列名字段数";
@@ -1081,22 +1081,16 @@
                Message = "模具清单模板：表头信息不符合规范,第4列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[4].ColumnName != "*仓库编码")
            else if (excelTable[0].Columns[4].ColumnName != "预计寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第5列应为{*仓库编码}";
                Message = "模具清单模板：表头信息不符合规范,第5列应为{预计寿命(次)}";
                return Message;
            }
            else if (excelTable[0].Columns[5].ColumnName != "预计寿命(次)")
            else if (excelTable[0].Columns[5].ColumnName != "剩余寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第6列应为{预计寿命(次)}";
                return Message;
            }
            else if (excelTable[0].Columns[6].ColumnName != "剩余寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第7列应为{剩余寿命(次)}";
                Message = "模具清单模板：表头信息不符合规范,第6列应为{剩余寿命(次)}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "模具编码")
@@ -3479,8 +3473,8 @@
                var dt3 = from r in excelTable[1].AsEnumerable()
                          where !(
                              from rr in excelTable[0].AsEnumerable()
                              select rr.Field<string>("*模具编号(唯一)")
                          ).Contains(r.Field<string>("模具编码"))
                              select rr.Field<string>("*模具编号(唯一)").Trim()
                          ).Contains(r.Field<string>("模具编码").Trim())
                          select r;
                List<DataRow> listRow = dt3.ToList();
                if (listRow.Count > 0)
@@ -3605,7 +3599,7 @@
                        list.Add(erro);
                    }
                    //通过模具点检标准页签模板中的标准编码查询模具点检项页签模板中对应的数据信息
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具点检标准编号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具点检标准编号"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                    if (ds.Rows.Count > 0)
                    {
@@ -3635,15 +3629,16 @@
            {
                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TMouldchk_Item where code=@code";
                    sql = @"select *  from TMouldchk_Item where code=@code and name=@name";
                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count < 0)
                    if (dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*模具点检项编号(唯一)}";
                        erro.ErrorCont = "模具点检部位表:{*模具点检项编号(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "在数据表中不存在";
                        erro.ErrorCont = "模具点检部位表:{*模具点检项编号(唯一),*模具点检项名称}字段{" + excelTable[1].Rows[k][2].ToString().Trim() +","+ excelTable[1].Rows[k][3].ToString().Trim() + "}在模具点检项中不存在";
                        list.Add(erro);
                    }
                }
@@ -3652,8 +3647,8 @@
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("*模具点检标准编号(唯一)")
                      ).Contains(r.Field<string>("*模具点检标准编号"))
                          select rr.Field<string>("*模具点检标准编号(唯一)").Trim()
                      ).Contains(r.Field<string>("*模具点检标准编号").Trim())
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)
@@ -3777,7 +3772,7 @@
                        list.Add(erro);
                    }
                    //通过模具保养标准页签模板中的标准编码查询模具保养项页签模板中对应的数据信息
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具保养标准编号"].ToString() == excelTable[0].Rows[j][0].ToString().Trim());
                    var var_dtTable = excelTable[1].AsEnumerable().Where<DataRow>(W => W["*模具保养标准编号"].ToString().Trim() == excelTable[0].Rows[j][0].ToString().Trim());
                    DataTable ds = var_dtTable.Any() ? var_dtTable.CopyToDataTable() : excelTable[1].Clone();
                    if (ds.Rows.Count > 0)
                    {
@@ -3807,15 +3802,16 @@
            {
                if (excelTable[1].Rows[k][2].ToString().Trim() != null && excelTable[1].Rows[k][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TMouldmai_Item where code=@code";
                    sql = @"select *  from TMouldmai_Item where code=@code and name=@name";
                    dynamicParams.Add("@code", excelTable[1].Rows[k][2].ToString().Trim());
                    dynamicParams.Add("@name", excelTable[1].Rows[k][3].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count < 0)
                    if (dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{*模具保养项编号(唯一)}";
                        erro.ErrorCont = "模具保养部位表:{*模具保养项编号(唯一)}字段" + excelTable[1].Rows[k][2].ToString().Trim() + "在数据表中不存在";
                        erro.ErrorCont = "模具保养部位表:{*模具保养项编号(唯一),*模具保养项名称}字段{" + excelTable[1].Rows[k][2].ToString().Trim() + "," + excelTable[1].Rows[k][3].ToString().Trim() + "}在模具保养项中不存在";
                        list.Add(erro);
                    }
                }
@@ -3824,8 +3820,8 @@
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("*模具保养标准编号(唯一)")
                      ).Contains(r.Field<string>("*模具保养标准编号"))
                          select rr.Field<string>("*模具保养标准编号(唯一)").Trim()
                      ).Contains(r.Field<string>("*模具保养标准编号").Trim())
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)
@@ -5393,8 +5389,8 @@
                //导入模具清单
                for (int k = 0; k < excelTable[0].Rows.Count; k++)
                {
                    sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
                    sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@usestatus,@surp_life,@resi_life,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
@@ -5403,11 +5399,9 @@
                            code = excelTable[0].Rows[k][0].ToString().Trim(),
                            name = excelTable[0].Rows[k][1].ToString().Trim(),
                            spec = excelTable[0].Rows[k][2].ToString().Trim(),
                            status = excelTable[0].Rows[k][3].ToString().Trim()=="正常"?"Y":"N",
                            usestatus = "0",//使用状态：在库/出库/上机/下机/维修/外借(0,1,2,3,4,5)
                            warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
                            surp_life =decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()),
                            resi_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim()),
                            status = excelTable[0].Rows[k][3].ToString().Trim(),
                            surp_life =decimal.Parse(excelTable[0].Rows[k][4].ToString().Trim()==""?"0": excelTable[0].Rows[k][4].ToString().Trim()),
                            resi_life = decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()==""?"0":excelTable[0].Rows[k][5].ToString().Trim()),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }