From 5707781039b9d902ce1d2d6727fba65bbab14574 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 13 九月 2025 17:02:06 +0800
Subject: [PATCH] 异常单回滚
---
WebApi/Gs.Toolbox/ExcelHelper.cs | 153 +++++++++++++++-----------------------------------
1 files changed, 47 insertions(+), 106 deletions(-)
diff --git a/WebApi/Gs.Toolbox/ExcelHelper.cs b/WebApi/Gs.Toolbox/ExcelHelper.cs
index b654eb7..beee68d 100644
--- a/WebApi/Gs.Toolbox/ExcelHelper.cs
+++ b/WebApi/Gs.Toolbox/ExcelHelper.cs
@@ -1032,9 +1032,6 @@
}
setCellVal(sheet, _idx, 0, "鐢熶骇杞﹂棿锛�" + (row0["workShop"]?.ToString() ?? ""));
sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 0, 5));
-
- setCellVal(sheet, _idx, 12, "瀹ゆ俯锛�" + (row0["temperature"]?.ToString() ?? ""));
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 12, 17));
_idx++;
// 绗�3琛岋細浜у搧淇℃伅
@@ -1053,11 +1050,9 @@
sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 6, 11));
setCellVal(sheet, _idx, 6, row0["itemModel"]?.ToString() ?? "");
- setCellVal(sheet, _idx, 12, "鐢靛帇");
- setCellVal(sheet, _idx, 13, row0["voltage"]?.ToString() ?? "");
-
- setCellVal(sheet, _idx, 14, "绾垮彿");
- setCellVal(sheet, _idx, 15, row0["lineNo"]?.ToString() ?? "");
+ setCellVal(sheet, _idx, 12, "绾垮彿");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 13, 15));
+ setCellVal(sheet, _idx, 13, row0["lineNo"]?.ToString() ?? "");
_idx++;
// 绗�4琛岋細鍟嗘爣绛変俊鎭�
@@ -1127,6 +1122,32 @@
setCellVal(sheet, _idx, 11, row0["sampleSize3"]?.ToString() ?? "");
_idx++;
+ int num;
+ if(row0["SampleMethod"]?.ToString() == "鍖�閫�")
+ {
+ if (int.TryParse(row0["sampleSize1"]?.ToString(), out int size))
+ {
+ num = size;
+ }
+ else
+ {
+ num = 0;
+ }
+ }
+ else
+ {
+ if (int.TryParse(row0["sampleSize2"]?.ToString(), out int size))
+ {
+ num = size;
+ }
+ else
+ {
+ num = 0;
+ }
+ }
+ if (num > 16)
+ num = 16;
+
// 绗�7琛岋細妫�楠岄」鐩〃澶�
IRow headerRow = sheet.CreateRow(_idx);
headerRow.HeightInPoints = rowHeight;
@@ -1137,10 +1158,8 @@
}
setCellVal(sheet, _idx, 0, "椤圭洰");
setCellVal(sheet, _idx, 1, "鏍囧噯");
- setCellVal(sheet, _idx, 2, "1");
- setCellVal(sheet, _idx, 3, "2");
// 鏍规嵁闇�瑕佺户缁坊鍔犳洿澶氬垪鏍囬锛岃繖閲岀畝鍖栦负涓昏鍒�
- for (int i = 4; i < 18; i++)
+ for (int i = 2; i < num+2; i++)
{
setCellVal(sheet, _idx, i, (i-1).ToString());
}
@@ -1165,7 +1184,7 @@
setCellVal(sheet, _idx, 1, rrr["RPB004"]?.ToString() ?? "");
// 濉厖16涓祴璇曞��
- for (int i = 0; i < 16; i++)
+ for (int i = 0; i < num; i++)
{
string colName = $"RPB{i + 5:D3}"; // RPB005, RPB006, ..., RPB020
if (rrr.Table.Columns.Contains(colName))
@@ -1261,7 +1280,7 @@
}
// 妫�楠屽垽瀹氬尯鍩燂紙3琛屽竷灞�锛�
- for (int judgeRowIndex = 0; judgeRowIndex < 3; judgeRowIndex++)
+ for (int judgeRowIndex = 0; judgeRowIndex < 2; judgeRowIndex++)
{
IRow judgmentRow = sheet.CreateRow(_idx);
judgmentRow.HeightInPoints = rowHeight;
@@ -1275,103 +1294,25 @@
{
// 绗竴琛岋細妫�楠屽垽瀹�
setCellVal(sheet, _idx, 0, "妫�楠屽垽瀹�");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx + 2, 0, 0)); // 妫�楠屽垽瀹氳法3琛�
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx + 1, 0, 0)); // 淇敼涓鸿法2琛岃�屼笉鏄�3琛�
+ setCellVal(sheet, _idx, 1, row0["CheckResult"]?.ToString() ?? "");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 1, 5)); // 鍙悎骞跺綋鍓嶈
- if (row0["CheckResult"]?.ToString() == "鍚堟牸")
- {
- setCellVal(sheet, _idx, 1, "鈭� 鍚堟牸 鈻� 涓嶅悎鏍�");
- }
- else if(row0["CheckResult"]?.ToString() == "涓嶅悎鏍�")
- {
- setCellVal(sheet, _idx, 1, "鈻� 鍚堟牸 鈭� 涓嶅悎鏍�");
- }
- else
- {
- setCellVal(sheet, _idx, 1, "鈻� 鍚堟牸 鈻� 涓嶅悎鏍�");
- }
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx + 1, 1, 5)); // 鍚堟牸/涓嶅悎鏍艰法2琛�
-
- setCellVal(sheet, _idx, 6, "瀹℃牳");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx + 2, 6, 6)); // 瀹℃牳璺�3琛�
-
- if (row0["ProcessResults"]?.ToString() == "鏃�")
- {
- setCellVal(sheet, _idx, 7, "鈭� 鏃� 鈻� 杩斿伐");
- }
- else if (row0["ProcessResults"]?.ToString() == "杩斿伐")
- {
- setCellVal(sheet, _idx, 7, "鈻� 鏃� 鈭� 杩斿伐");
- }
- else
- {
- setCellVal(sheet, _idx, 7, "鈻� 鏃� 鈻� 杩斿伐");
- }
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 7, 11));
-
- setCellVal(sheet, _idx, 12, "瀹℃壒");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx + 2, 12, 12)); // 瀹℃壒璺�3琛�
-
- if (row0["ProcessResults"]?.ToString() == "鏃�")
- {
- setCellVal(sheet, _idx, 13, "鈭� 鏃� 鈻� 杩斿伐");
- }
- else if (row0["ProcessResults"]?.ToString() == "杩斿伐")
- {
- setCellVal(sheet, _idx, 13, "鈻� 鏃� 鈭� 杩斿伐");
- }
- else
- {
- setCellVal(sheet, _idx, 13, "鈻� 鏃� 鈻� 杩斿伐");
- }
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 13, 17));
+ setCellVal(sheet, _idx, 6, "妫�楠岀鍚�");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 7, 10)); // 鍙悎骞跺綋鍓嶈
+ setCellVal(sheet, _idx, 7, row0["JY_NAME"]?.ToString() ?? "");
+ setCellVal(sheet, _idx, 11, "瀹℃牳绛惧悕");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 12, 16)); // 鍙悎骞跺綋鍓嶈
+ setCellVal(sheet, _idx, 12, row0["CHECK_USER"]?.ToString() ?? "");
}
else if (judgeRowIndex == 1)
{
- if (row0["ProcessResults"]?.ToString() == "璁╂鎺ユ敹")
- {
- setCellVal(sheet, _idx, 7, "鈭� 璁╂鎺ユ敹 鈻� 鐗归噰");
- }
- else if (row0["ProcessResults"]?.ToString() == "鐗归噰")
- {
- setCellVal(sheet, _idx, 7, "鈻� 璁╂鎺ユ敹 鈭� 鐗归噰");
- }
- else
- {
- setCellVal(sheet, _idx, 7, "鈻� 璁╂鎺ユ敹 鈻� 鐗归噰");
- }
- // 绗簩琛岋細璁╂鎺ユ敹閫夐」
-
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 7, 11));
-
- if (row0["ProcessResults"]?.ToString() == "璁╂鎺ユ敹")
- {
- setCellVal(sheet, _idx, 13, "鈭� 璁╂鎺ユ敹 鈻� 鐗归噰");
- }
- else if (row0["ProcessResults"]?.ToString() == "鐗归噰")
- {
- setCellVal(sheet, _idx, 13, "鈻� 璁╂鎺ユ敹 鈭� 鐗归噰");
- }
- else
- {
- setCellVal(sheet, _idx, 13, "鈻� 璁╂鎺ユ敹 鈻� 鐗归噰");
- }
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 13, 17));
- }
- else
- {
- // 绛惧悕琛�
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 1, 2));
- setCellVal(sheet, _idx, 1, $"绛惧悕/鏃ユ湡锛�");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 3, 5));
- setCellVal(sheet, _idx, 3, $"{row0["JY_USER"]?.ToString() ?? ""}/{row0["JY_DATE"]?.ToString() ?? ""}");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 7, 8));
- setCellVal(sheet, _idx, 7, $"绛惧悕/鏃ユ湡锛�");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 9, 11));
- setCellVal(sheet, _idx, 9, $"{row0["CHECK_USER"]?.ToString() ?? ""}/{row0["CHECK_DATE"]?.ToString() ?? ""}");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 13, 14));
- setCellVal(sheet, _idx, 13, $"绛惧悕/鏃ユ湡锛�");
- sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 15, 17));
- setCellVal(sheet, _idx, 15, $"{row0["SP_USER"]?.ToString() ?? ""}/{row0["SP_DATE"]?.ToString() ?? ""}");
+ setCellVal(sheet, _idx, 6, "妫�楠屾棩鏈�");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 7, 10)); // 鍙悎骞跺綋鍓嶈
+ setCellVal(sheet, _idx, 7, row0["JY_DATE"]?.ToString() ?? "");
+ setCellVal(sheet, _idx, 11, "瀹℃牳鏃ユ湡");
+ sheet.AddMergedRegion(new CellRangeAddress(_idx, _idx, 12, 16)); // 鍙悎骞跺綋鍓嶈
+ setCellVal(sheet, _idx, 12, row0["CHECK_DATE"]?.ToString() ?? "");
}
_idx++;
}
--
Gitblit v1.9.3