From ae4aab211046c23bc9a7b3a8330e6b02591d4af0 Mon Sep 17 00:00:00 2001
From: sunshiqiang <sunshiqiang@ng.com>
Date: 星期五, 29 八月 2025 16:05:55 +0800
Subject: [PATCH] 1.修复了增加工程联机状态后的问题
---
optimize_patch/订单排样客户端/EDIT/功能/工程管理.cs | 275 ++++++++++++++++++------------------------------------
1 files changed, 92 insertions(+), 183 deletions(-)
diff --git "a/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\345\212\237\350\203\275/\345\267\245\347\250\213\347\256\241\347\220\206.cs" "b/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\345\212\237\350\203\275/\345\267\245\347\250\213\347\256\241\347\220\206.cs"
index acd130d..4a44890 100644
--- "a/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\345\212\237\350\203\275/\345\267\245\347\250\213\347\256\241\347\220\206.cs"
+++ "b/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\345\212\237\350\203\275/\345\267\245\347\250\213\347\256\241\347\220\206.cs"
@@ -163,29 +163,6 @@
}
- void QueryProjectData()
- {
-
- string qInfo = txtQuery.Text.Trim() == inputText ? null : txtQuery.Text.Trim();
-
- if (!string.IsNullOrEmpty(qInfo) && qInfo.First() != 'P' && !qInfo.ToUpper().StartsWith("NG"))
- {
- globel.ShowWarningMessage("璇疯緭鍏ユ纭殑宸ョ▼鍙锋垨娴佺▼鍗″彿锛�");
- return;
- }
- string sDate = dtpStartDate.Value.ToString("yyyy-MM-dd");
- string eDate = dtpEndDate.Value.ToString("yyyy-MM-dd");
-
- pagenum = 0;
- pagestart = 0;
- isSelect = true;
- ShowProjectData(qInfo);
-
- dgvProject.DataSource = show_data.DefaultView;
- //DataTableUtil.RegistScrollToEndEvent(dgvProjectData, dataGrid_OnScrollToEnd(sender,e))
- //dgvShowSet();
- }
-
/// <summary>
/// 绛涢�夊伐绋嬫暟鎹�
/// </summary>
@@ -259,107 +236,134 @@
//dgvProject.AllowUserToResizeColumns = true;
LoadProjectInfo();
-
-
- dgvShowSet();
+
+ dgvShowColumnsSet();
+ dgvShowRowSet();
}
-
- void dgvShowSet()
+ void dgvShowColumnsSet()
{
if (Setting.language == 0)
{
+ //dgvProject.ColumnHeadersHeight = 30;
+
dgvProject.Columns["Id"].Visible = false;
dgvProject.Columns[0].Frozen = true;
dgvProject.Columns[1].Frozen = true;
for (int i = 1; i < dgvProject.ColumnCount; i++)
{
- //if (i <= 8)
- //{
- // dgvProject.Columns[i].Width = 80;
+ dgvProject.Columns[i].SortMode = DataGridViewColumnSortMode.NotSortable;
- //}
- ////dgvProject.Columns[i].ReadOnly = false;
- //else if (i != 11)
- //{
- // //dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
- // dgvProject.Columns[i].Width = 150;
- //}
- //else
- //{
- // dgvProject.Columns[11].Width = 200;
- //}
-
- if (i > dgvProject.ColumnCount - 2) {
-
+ if (i > dgvProject.ColumnCount - 4)
+ {
dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
- continue;
+ //continue;
}
switch (i)
{
- case 2:
- case 3:
+ case 2://宸ョ▼鍙�
+
dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
break;
- case 4:
- case 5:
- case 6:
- case 7:
- case 8:
+ case 3://鍚嶇О
+ dgvProject.Columns[i].Width = 100;
+ break;
+ case 4://鑶滅郴
+ case 5://鍘氬害
+ case 6://绫诲瀷
dgvProject.Columns[i].Width = 80;
break;
- case 10:
+ case 7://杩炵嚎鐘舵��
//dgvProject.Columns[i].Visible = false;
- dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
- break;
- case 9:
- case 11:
+ //dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
+ //dgvProject.Columns[i].Width = 120;
dgvProject.Columns[i].Visible = false;
- //dgvProject.Columns[11].Width = 200;
break;
-
- case 12:
- case 13:
- case 17:
- case 18:
+ case 8://鏁伴噺
+ case 9://闈㈢Н
+ dgvProject.Columns[i].Width = 80;
+ break;
+ case 10://娴佺▼鍗℃暟閲�
+ case 11://鍘熺墖浣跨敤鏁伴噺
+ //dgvProject.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
+ dgvProject.Columns[i].Width = 120;
+ break;
+ case 12://娴佺▼鍗″垪琛�
+ dgvProject.Columns[i].Width = 200;
+ break;
+ //case 13://鏈�灏忔幇杈�
+ case 14://閽㈠寲瑁呰浇鐜�
+ case 15://閽㈠寲鐐夋暟
+ //case 16://骞冲潎鍒囪鐜�
+ //case 17://鏈夋晥鍒囪鐜�
+ //case 18://灏剧墖鍒囪鐜�
+ case 19://鍘熸枡浣跨敤鏁�-绗竴娆′紭鍖�
+ case 20://骞冲潎鍒囪鐜�-绗竴娆′紭鍖�
+ //case 21://澶囨敞
+ //case 22://鎿嶄綔浜�
+ //case 23://鍒涘缓鏃堕棿
+
+ // break;
+ case 24://淇敼鏃堕棿
+ case 25://Public_status锛氬叕寮�鐘舵��
+ case 26://createrId锛屽垱寤轰汉ID
+ case 27://state:宸ョ▼鐘舵��
+ case 28://online_status 锛氳繛绾跨姸鎬�
dgvProject.Columns[i].Visible = false;
break;
default:
dgvProject.Columns[i].Width = 150;
break;
}
-
}
-
}
- else {
-
+ else
+ {
dgvProject.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.ColumnHeader;
}
+ dgvProject.Columns[12].ContextMenuStrip = MenuFlowCard;
-
-
-
-
-
- dgvProject.Columns[11].ContextMenuStrip = MenuFlowCard;
-
dgvProject.AllowUserToResizeColumns = true;
dgvProject.Refresh();
//dgvProject.Columns[11].Width = 150;
+ }
- /////宸ョ▼鍙�
- //dgvProject.Columns["宸ョ▼鍙�"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
- ////鍚嶇О
- //dgvProject.Columns["鍚嶇О"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
- //dgvProject.Columns["鑶滅郴"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
- //dgvProject.Columns["鍒涘缓鏃堕棿"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
+ void dgvShowRowSet()
+ {
+ if (!dgvProject.Columns.Contains("public_status"))
+ {
+ return;
+ }
+ for (int i = 1; i < dgvProject.RowCount; i++)
+ {
+ dgvProject.Rows[i].ReadOnly = true;
+ string isPublic = dgvProject.Rows[i].Cells["public_status"].Value.ToString();
+ if (isPublic == "1")
+ {
+
+ dgvProject.Rows[i].Cells[1].Style.BackColor = ColorUtil.SelectedColor;
+ }
+
+ object oS = dgvProject.Rows[i].Cells["online_status"].Value;
+ string onlineStatus = oS == null ? "1" : oS.ToString();
+ if (onlineStatus == "1" || string.IsNullOrEmpty(onlineStatus))
+ {
+ //dgvProject.Rows[i].Cells[7].Value = "杩炵嚎鐢熶骇";
+ dgvProject.Rows[i].Cells[7].Style.BackColor = ColorUtil.SelectedColor;
+
+ }
+ else
+ {
+ //dgvProject.Rows[i].Cells[7].Value = "鍗曟満鐢熶骇";
+ dgvProject.Rows[i].Cells[7].Style.BackColor = Color.Red;
+ }
+ }
}
@@ -414,9 +418,9 @@
//sTotal += dr["鍘熺墖浣跨敤鏁伴噺"] == DBNull.Value ? 0 : Convert.ToInt32(dr["鍘熺墖浣跨敤鏁伴噺"]);
- gTotal += dr[7] == DBNull.Value ? 0 : Convert.ToInt32(dr[7].ToString());//"鏁伴噺"
- gTotalArea += dr[8] == DBNull.Value ? 0 : Convert.ToDouble(dr[8]);//"闈㈢Н"
- sTotal += dr[10] == DBNull.Value ? 0 : Convert.ToInt32(dr[10]);//"鍘熺墖浣跨敤鏁伴噺"
+ gTotal += dr[8] == DBNull.Value ? 0 : Convert.ToInt32(dr[8].ToString());//"鏁伴噺"
+ gTotalArea += dr[9] == DBNull.Value ? 0 : Convert.ToDouble(dr[9]);//"闈㈢Н"
+ sTotal += dr[11] == DBNull.Value ? 0 : Convert.ToInt32(dr[11]);//"鍘熺墖浣跨敤鏁伴噺"
}
dgvProject.Visible = true;
@@ -471,6 +475,7 @@
this.StartPosition = FormStartPosition.CenterScreen;
}
+
void BtnShowSet()
{
labelUtil.setLabelName(ref lblBtnExport);
@@ -507,100 +512,7 @@
}
-
- #region 婊氬姩鏉″埌搴曞埛鏂帮紝鏈娇鐢�
- void dataGrid_OnScrollToEnd(object sender, EventArgs e)
- {
- pagenum++;
- pagestart = pagenum * pagesize;
-
- string qInfo = txtQuery.Text.Trim() == inputText ? null : txtQuery.Text.Trim();
- ShowProjectData(qInfo);
- }
-
-
- private void AddLinkColumn()
- {
- DataGridViewLinkColumn links = new DataGridViewLinkColumn();
-
- links.Name = "lookLayout";
- links.UseColumnTextForLinkValue = true;
- links.HeaderText = "鎿嶄綔";
- //links.DataPropertyName = ColumnName.ReportsTo.ToString();
- links.ActiveLinkColor = Color.White;
- links.LinkBehavior = LinkBehavior.SystemDefault;
- links.LinkColor = Color.Blue;
- links.TrackVisitedState = true;
- links.VisitedLinkColor = Color.YellowGreen;
-
-
- dgvProject.Columns.Add(links);
- }
- #endregion
-
bool isSelect = false;
- void ShowProjectData(string qinfo)
- {
- int gTotal = 0;
- double gTotalArea = 0;
-
- int sTotal = 0;
- double sTotalArea = 0;
-
- if (isSelect)
- {
- show_data = ProjectDB.SelectProjectManage(qinfo, pagestart, pagesize);
- foreach (DataRow dr in show_data.Rows)
- {
- //gTotal += dr["鏁伴噺"] == DBNull.Value ? 0 : Convert.ToInt32(dr["鏁伴噺"].ToString());
- //gTotalArea += dr["闈㈢Н"] == DBNull.Value ? 0 : Convert.ToDouble(dr["闈㈢Н"]);
- //sTotal += dr["鍘熺墖浣跨敤鏁伴噺"] == DBNull.Value ? 0 : Convert.ToInt32(dr["鍘熺墖浣跨敤鏁伴噺"]);
-
-
- gTotal += dr[7] == DBNull.Value ? 0 : Convert.ToInt32(dr[7].ToString());//"鏁伴噺"
- gTotalArea += dr[8] == DBNull.Value ? 0 : Convert.ToDouble(dr[8]);//"闈㈢Н"
- sTotal += dr[10] == DBNull.Value ? 0 : Convert.ToInt32(dr[10]);//"鍘熺墖浣跨敤鏁伴噺"
- }
-
-
- dgvProject.Visible = true;
- dgvProject.DataSource = show_data.DefaultView;
-
- //dgvProjectData.Columns["鎿嶄綔"].DataGridView.Columns
-
- isSelect = false;
- }
- else
- {
- int rindex = dgvProject.FirstDisplayedScrollingRowIndex;
- DataTable dataTable = ProjectDB.SelectProjectManage(qinfo, pagestart, pagesize);
- foreach (DataRow dr in dataTable.Rows)
- {
- //gTotal += dr["鏁伴噺"] == DBNull.Value ? 0 : Convert.ToInt32(dr["鏁伴噺"].ToString());
- //gTotalArea += dr["闈㈢Н"] == DBNull.Value ? 0 : Convert.ToInt64(dr["闈㈢Н"]);
- //sTotal += dr["鍘熺墖浣跨敤鏁伴噺"] == DBNull.Value ? 0 : Convert.ToInt32(dr["鍘熺墖浣跨敤鏁伴噺"]);
-
- gTotal += dr[7] == DBNull.Value ? 0 : Convert.ToInt32(dr[7].ToString());//"鏁伴噺"
- gTotalArea += dr[8] == DBNull.Value ? 0 : Convert.ToDouble(dr[8]);//"闈㈢Н"
- sTotal += dr[10] == DBNull.Value ? 0 : Convert.ToInt32(dr[10]);//"鍘熺墖浣跨敤鏁伴噺"
- }
-
-
- if (dataTable.Rows.Count != 0)
- {
- show_data.Merge(dataTable);
-
- //dgvProjectData.FirstDisplayedScrollingRowIndex = (pagenum > 1 ? pagenum - 1 : 1) * 20;
- dgvProject.FirstDisplayedScrollingRowIndex = rindex;
- }
-
- }
-
- lblGlassNum.Text = (Convert.ToInt32(lblGlassNum.Text) + gTotal).ToString();
- lblGlassArea.Text = (Convert.ToDouble(lblGlassArea.Text.Trim()) + gTotalArea).ToString();
- lblStockNum.Text = (Convert.ToInt32(lblStockNum.Text.Trim()) + sTotal).ToString();
-
- }
private void tableLayoutPanel1_Paint(object sender, PaintEventArgs e)
{
@@ -964,7 +876,7 @@
//// 搴旂敤鏇存敼鍚庣殑鍗曞厓鏍兼牱寮忓埌鎸囧畾鍒�
//dgvProject.Columns[11].DefaultCellStyle = cellStyle;
- dgvProject.Columns[11].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
+ dgvProject.Columns[12].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
dgvProject.FirstDisplayedScrollingColumnIndex = 11;
TSMIHideFlowCard.Visible = true;
TSMIShowFlowCard.Visible = false;
@@ -974,8 +886,8 @@
//dgvProject.Columns[11].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
- dgvProject.Columns[11].AutoSizeMode = DataGridViewAutoSizeColumnMode.None;
- dgvProject.Columns[11].Width = 200;
+ dgvProject.Columns[12].AutoSizeMode = DataGridViewAutoSizeColumnMode.None;
+ dgvProject.Columns[12].Width = 200;
dgvProject.FirstDisplayedScrollingColumnIndex = 3;
TSMIHideFlowCard.Visible = false;
TSMIShowFlowCard.Visible = true;
@@ -1185,9 +1097,6 @@
DGVtRigthClickOperate(14);
}
-
-
- bool showFlowCard = false;
private void TSMIShowFlowCard_Click(object sender, EventArgs e)
{
strCurrentOperate = TSMIShowFlowCard.Text;
--
Gitblit v1.8.0