lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
汪青
2024-07-15 22:38:49 +08:00
parent 20d7c09645 d2daed8a91
commit 8cbc218584
29 changed files with 896 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
+1 -5
View File
@@ -261,11 +261,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
string row9 = pds.Rows[i][9].ToString();
if (string.IsNullOrEmpty(row9))
{
result += (i + 2).ToString() + "," + "上报日期" + "," + "此项为必填项！" + "|";
}
else
if (!string.IsNullOrEmpty(row9))
{
try
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+1 -1
View File
@@ -459,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()));
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()));
if (oldViewInfo==null)
{
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();