diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs index d78476f..570450d 100644 --- a/FactorySystemApi/Controllers/TeamworkController.cs +++ b/FactorySystemApi/Controllers/TeamworkController.cs @@ -877,7 +877,7 @@ namespace FactorySystemApi.Controllers var factoryName = ws.Cells[row, 2].Value; // 模式 要变化为工厂ID var materialGroup = ws.Cells[row, 3].Value; // 物料组 要变换为物料组ID var weightUnit = ws.Cells[row, 4].Value; // 计量单位 - var testCode = ws.Cells[row, 5].Value; // 试验号 要跟版本号一起查询出配方 + var testCode = ws.Cells[row, 5].Value == null ? "" : ws.Cells[row, 5].Value; // 试验号 要跟版本号一起查询出配方 var versionCode = ws.Cells[row, 6].Value; // 版本号 var state = ws.Cells[row, 7].Value; // 创建方式(新增/暂存) @@ -962,14 +962,20 @@ namespace FactorySystemApi.Controllers var materialGroupId = materialGroup.ToString().Split('+')[0]; // 获取配方 - TFS_Formula formula = TeamworkBll.GetFormulaByTestCodeAndVersion(testCode.ToString(), versionCode.ToString()); - if (formula == null) + var formulaName = ""; + var formulaId = -1; + if (!string.IsNullOrEmpty(testCode.ToString()) && !string.IsNullOrEmpty(versionCode.ToString())) { - errStr = errStr + "试验号或版本号不正确;"; - isOk = false; + TFS_Formula formula = TeamworkBll.GetFormulaByTestCodeAndVersion(testCode.ToString(), versionCode.ToString()); + if (formula == null) + { + errStr = errStr + "试验号或版本号不正确;"; + isOk = false; + } + formulaName = formula.FName + "+" + formula.FTestCode + "+" + formula.FVersionCode; + formulaId = formula.FID; } - var formulaName = formula.FName + "+" + formula.FTestCode + "+" + formula.FVersionCode; - var formulaId = formula.FID; + // 校验未通过,继续下一条 if (!isOk)