Commit a8725391 by xin.yang

fix bug

parent 8190347a
...@@ -6661,6 +6661,8 @@ export default { ...@@ -6661,6 +6661,8 @@ export default {
'8220': '未备模', '8220': '未备模',
'8221': '备模中', '8221': '备模中',
'8222': '备模完成', '8222': '备模完成',
'8223': '请填写项次',
'8224': '项次必须是正整数',
'120001': '模具未找到', '120001': '模具未找到',
'120002': '模具类型不能为空', '120002': '模具类型不能为空',
......
...@@ -6952,6 +6952,8 @@ export default { ...@@ -6952,6 +6952,8 @@ export default {
'8220': '未备模', '8220': '未备模',
'8221': '备模中', '8221': '备模中',
'8222': '备模完成', '8222': '备模完成',
'8223': '请填写项次',
'8224': '项次必须是正整数',
// ims专用,不要接着写 // ims专用,不要接着写
'120001': '模具未找到', '120001': '模具未找到',
......
...@@ -221,7 +221,7 @@ namespace Siger.Middlelayer.Utility.ImportEntities ...@@ -221,7 +221,7 @@ namespace Siger.Middlelayer.Utility.ImportEntities
public string unhealthy_code { get; set; } public string unhealthy_code { get; set; }
[ExcelColumn("项次*")] [ExcelColumn("项次*")]
public int seq { get; set; } public string seq { get; set; }
[ExcelColumn("是否送检*(1=>人工检验2=>送检检验)*")] [ExcelColumn("是否送检*(1=>人工检验2=>送检检验)*")]
public string isinpect { get; set; } public string isinpect { get; set; }
......
...@@ -219,6 +219,17 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -219,6 +219,17 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
return new CommonImportResult(0, string.Join(";", errors)); return new CommonImportResult(0, string.Join(";", errors));
} }
if (string.IsNullOrEmpty(item.seq))
{
errors.Add($"{rowIndex},{8223}");
return new CommonImportResult(0, string.Join(";", errors));
}
if (!int.TryParse(item.seq, out int intSeq) || item.seq.ToInt() <= 0)
{
errors.Add($"{rowIndex},{8224}");
return new CommonImportResult(0, string.Join(";", errors));
}
var itemPinYin = PinYinHelper.ToPinYin(item.item); var itemPinYin = PinYinHelper.ToPinYin(item.item);
if (string.IsNullOrWhiteSpace(itemPinYin)) if (string.IsNullOrWhiteSpace(itemPinYin))
{ {
...@@ -262,7 +273,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -262,7 +273,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
errors.Add($"{rowIndex},{(int)RequestEnum.MaxMinError}"); errors.Add($"{rowIndex},{(int)RequestEnum.MaxMinError}");
} }
if ((p.value_category.ToInt() == (int)ValueCategory.Maxmin && string.IsNullOrEmpty(p.range)) || p.seq <= 0 || if ((p.value_category.ToInt() == (int)ValueCategory.Maxmin && string.IsNullOrEmpty(p.range)) || p.seq.ToInt() <= 0 ||
(p.value_type.ToInt() == (int)ValueTypeStatus.V && p.value_category.ToInt() <= 0) || (p.value_type.ToInt() == (int)ValueTypeStatus.V && p.value_category.ToInt() <= 0) ||
string.IsNullOrWhiteSpace(p.lcl) && !string.IsNullOrWhiteSpace(p.ucl) || string.IsNullOrWhiteSpace(p.lcl) && !string.IsNullOrWhiteSpace(p.ucl)) string.IsNullOrWhiteSpace(p.lcl) && !string.IsNullOrWhiteSpace(p.ucl) || string.IsNullOrWhiteSpace(p.lcl) && !string.IsNullOrWhiteSpace(p.ucl))
{ {
...@@ -277,7 +288,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -277,7 +288,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
errors.Add($"{rowIndex},{(int)RequestEnum.InspectItemRepeat}"); errors.Add($"{rowIndex},{(int)RequestEnum.InspectItemRepeat}");
} }
var querySeq = _context.siger_qms_inspection_standard.FirstOrDefault(t => t.seq == p.seq && var querySeq = _context.siger_qms_inspection_standard.FirstOrDefault(t => t.seq == p.seq.ToInt() &&
t.projectid == projectid && t.status == (int)RowState.Valid && t.productid == p.productid && t.projectid == projectid && t.status == (int)RowState.Valid && t.productid == p.productid &&
t.sectionid == p.sectionid && t.standard_type == p.isinpect.ToInt()); t.sectionid == p.sectionid && t.standard_type == p.isinpect.ToInt());
if (querySeq != null || standardList.Count(t => t.seq == p.seq && if (querySeq != null || standardList.Count(t => t.seq == p.seq &&
...@@ -302,10 +313,10 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -302,10 +313,10 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
{ {
if (p.value_type == "3") if (p.value_type == "3")
{ {
var standard = _context.siger_qms_inspection_standard.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq).FirstOrDefault(); var standard = _context.siger_qms_inspection_standard.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq.ToInt()).FirstOrDefault();
if (standard == null) if (standard == null)
{ {
var data = entities.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq).FirstOrDefault(); var data = entities.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq.ToInt()).FirstOrDefault();
if (data != null) if (data != null)
{ {
continue; continue;
...@@ -317,7 +328,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -317,7 +328,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
productcode = p.productcode, productcode = p.productcode,
sectionid = p.sectionid, sectionid = p.sectionid,
standard = p.standard, standard = p.standard,
seq = p.seq, seq = p.seq.ToInt(),
item = p.item ?? "", item = p.item ?? "",
item_en = p.item_en, item_en = p.item_en,
unit = p.unit ?? "", unit = p.unit ?? "",
...@@ -352,7 +363,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -352,7 +363,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
productcode = p.productcode, productcode = p.productcode,
sectionid = p.sectionid, sectionid = p.sectionid,
standard = p.standard, standard = p.standard,
seq = p.seq, seq = p.seq.ToInt(),
item = p.item ?? "", item = p.item ?? "",
item_en = p.item_en, item_en = p.item_en,
unit = p.unit ?? "", unit = p.unit ?? "",
...@@ -386,7 +397,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories ...@@ -386,7 +397,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
{ {
if (p.value_type=="3") if (p.value_type=="3")
{ {
var standard = _context.siger_qms_inspection_standard.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq && q.status==(int)RowState.Valid).FirstOrDefault(); var standard = _context.siger_qms_inspection_standard.Where(q => q.value_type == 3 && q.productcode == p.productcode && q.sectionid == p.sectionid && q.seq == p.seq.ToInt() && q.status==(int)RowState.Valid).FirstOrDefault();
var option = new siger_qms_inspection_standard_option var option = new siger_qms_inspection_standard_option
{ {
standardid= standard.id, standardid= standard.id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment