diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs index 41f4cb3..c3e3e7d 100644 --- a/插件库/Lskj.PubBill/BillModule.cs +++ b/插件库/Lskj.PubBill/BillModule.cs @@ -2788,18 +2788,18 @@ namespace Lskj.PubBill MessageUtil.Show($"物料编码必填"); return; } - ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件分类")).FirstOrDefault(); + ControlModel modeControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault(); string addMode = ControlObj.GetControlValue(modeControlModel); - if (impRtnModel.ShowType.Equals("1")) + if (impRtnModel.ShowType.Equals("1") && string.IsNullOrEmpty(addMode)) { MessageUtil.Show($"上传模式必填"); return; } - ControlModel sepciesNoControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("上传模式")).FirstOrDefault(); + ControlModel sepciesNoControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("文件分类")).FirstOrDefault(); string sepciesNo = ControlObj.GetControlValue(sepciesNoControlModel); - if (impRtnModel.ShowType.Equals("1") || impRtnModel.ShowType.Equals("6")) + if ((impRtnModel.ShowType.Equals("1") || impRtnModel.ShowType.Equals("6")) && string.IsNullOrEmpty(sepciesNo)) { - MessageUtil.Show($"节点编号必填必填"); + MessageUtil.Show($"文件分类必填"); return; } DataTable sourceTable = gcMain.gridControl.DataSourceTable();