From 29251ef292790fa37b7db3512e282f1e76c746fc Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 31 Jul 2023 17:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E8=AF=95=E9=AA=8C=E5=8F=B7=E4=B8=BA=E7=A9=BA=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TeamworkController.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) 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)