diff --git a/FactorySystemApi/Controllers/PackageController.cs b/FactorySystemApi/Controllers/PackageController.cs index 156ecc5..6423a12 100644 --- a/FactorySystemApi/Controllers/PackageController.cs +++ b/FactorySystemApi/Controllers/PackageController.cs @@ -142,6 +142,16 @@ namespace FactorySystemApi.Controllers if ("1".Equals(sOperateType)) { + // 20230422 新增逻辑 + // 包规存在则不允许添加包材 + string fcode = inParam["FCode"].ToString(); + TFS_PackageMain package = PackageBll.GetPackageByFCode(fcode); + + if (package != null) + { + return -2; + } + mainId = PackageBll.UpdatePackage(inParam); inParam.Remove("FID"); inParam.Add("FID", mainId); diff --git a/FactorySystemBll/PackageBll.cs b/FactorySystemBll/PackageBll.cs index b9eab7b..2db58f0 100644 --- a/FactorySystemBll/PackageBll.cs +++ b/FactorySystemBll/PackageBll.cs @@ -212,6 +212,13 @@ namespace FactorySystemBll * 当FOperateType == 1,即由包材清单入口进入时调用 * **/ + // 根据包规获取包材 20230421 + public TFS_PackageMain GetPackageByFCode(string FCode) + { + SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); + return db.Queryable().Where(s => s.FCode == FCode).First(); + } + // 新的包材子项新增 public void InsertPackageChild(Dictionary inParam, List childList) {