From 22eec752e72650a42c7208397fefdcb0e61a749d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.cs | 145 +++++++++++++++++++++++-------------------------
1 files changed, 70 insertions(+), 75 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
index fd7b77f..e3a5aae 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.cs"
@@ -58,12 +58,12 @@
private void bclk_Click(object sender, EventArgs e)
{
//淇濆瓨鍒楀
- DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain1, this.Name);
}
private void mrlk_Click(object sender, EventArgs e)
{
- DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain1, this.Name);
}
//娓呯┖鐣岄潰
@@ -184,7 +184,7 @@
{
//鎵撳嵃鍒濆鍖�
oSumGrid.NoCol = HSnoCol;
- oSumGrid.ogrdMain = grdMain;
+ oSumGrid.ogrdMain = grdMain1;
oSumGrid.oGridsum = grdSum;
lblCaption.Text = ModName;
this.Text = ModName;
@@ -406,39 +406,39 @@
foreach (Model.ClsGy_StdWorkTimes_Model oSub in BillNew.DetailColl)
{
//
- if (i >= grdMain.RowCount - 1)
- grdMain.Rows.Add();
- grdMain.Rows[i].Cells[HTagCol].Value = "*";
- grdMain.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
+ if (i >= grdMain1.RowCount - 1)
+ grdMain1.Rows.Add();
+ grdMain1.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain1.Rows[i].Cells[HMaterIDCol].Value = oSub.HMaterID.ToString();
if (oMater.GetInfoByID(oSub.HMaterID))
{
- grdMain.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
- grdMain.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
- grdMain.Rows[i].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+ grdMain1.Rows[i].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ grdMain1.Rows[i].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+ grdMain1.Rows[i].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
}
else
{
- grdMain.Rows[i].Cells[HMaterNumberCol].Value = "";
- grdMain.Rows[i].Cells[HMaterNameCol].Value = "";
- grdMain.Rows[i].Cells[HMaterModelCol].Value = "";
+ grdMain1.Rows[i].Cells[HMaterNumberCol].Value = "";
+ grdMain1.Rows[i].Cells[HMaterNameCol].Value = "";
+ grdMain1.Rows[i].Cells[HMaterModelCol].Value = "";
}
- grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
+ grdMain1.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
if (oProc.GetInfoByID(oSub.HProcID))
{
- grdMain.Rows[i].Cells[HProcNumberCol].Value = oProc.omodel.HNumber;
- grdMain.Rows[i].Cells[HProcNameCol].Value = oProc.omodel.HName;
+ grdMain1.Rows[i].Cells[HProcNumberCol].Value = oProc.omodel.HNumber;
+ grdMain1.Rows[i].Cells[HProcNameCol].Value = oProc.omodel.HName;
}
else
{
- grdMain.Rows[i].Cells[HProcNumberCol].Value = "";
- grdMain.Rows[i].Cells[HProcNameCol].Value = "";
+ grdMain1.Rows[i].Cells[HProcNumberCol].Value = "";
+ grdMain1.Rows[i].Cells[HProcNameCol].Value = "";
}
- grdMain.Rows[i].Cells[HStdWorkTimes].Value = oSub.HStdWorkTimes.ToString();
- grdMain.Rows[i].Cells[HUpperlimit].Value = oSub.HUpperlimit.ToString();
- grdMain.Rows[i].Cells[HLowerlimit].Value = oSub.HLowerlimit.ToString();
- grdMain.Rows[i].Cells[HUSEORGID].Value = oSub.HUSEORGID.ToString();
- grdMain.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
+ grdMain1.Rows[i].Cells[HStdWorkTimes].Value = oSub.HStdWorkTimes.ToString();
+ grdMain1.Rows[i].Cells[HUpperlimit].Value = oSub.HUpperlimit.ToString();
+ grdMain1.Rows[i].Cells[HLowerlimit].Value = oSub.HLowerlimit.ToString();
+ grdMain1.Rows[i].Cells[HUSEORGID].Value = oSub.HUSEORGID.ToString();
+ grdMain1.Rows[i].Cells[HRemarkCol].Value = oSub.HRemark;
i = i + 1;
}
//GRID鍏佽鍒锋柊
@@ -463,20 +463,15 @@
//鏄庣粏琛ㄦ槸鍚︿负闆惰
bool b = false;
- for (int i = 0; i < grdMain.RowCount; i++)
- {
- if (!IsNullRow(i))
- {
- b = true;
- break;
- }
- }
- if (b == false)
+ if (!IsNullRow(0))
{
MessageBox.Show("琛ㄤ綋鏄庣粏琛屼笉瀛樺湪锛佽褰曞叆锛�", "鎻愮ず");
return false;
}
- return true;
+ else
+ {
+ return true;
+ }
}
//淇濆瓨鍗曟嵁
private bool Sub_SaveBill()
@@ -498,21 +493,21 @@
//
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl = new List<Model.ClsGy_StdWorkTimes_Model>();
- for (i = 0; i <= grdMain.RowCount - 1; i++)
+ for (i = 0; i <= grdMain1.RowCount - 1; i++)
{
- if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 && DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value) != 0)
+ if (DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HMaterIDCol].Value) != 0 && DBUtility.ClsPub.isLong(grdMain1.Rows[i].Cells[HProcIDCol].Value) != 0)
{
Model.ClsGy_StdWorkTimes_Model oSub = new Model.ClsGy_StdWorkTimes_Model();
- oSub.HMaterID = ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value);
- oSub.HProcID = ClsPub.isLong(grdMain.Rows[i].Cells[HProcIDCol].Value);
- oSub.HStdWorkTimes = ClsPub.isDoule(grdMain.Rows[i].Cells[HStdWorkTimes].Value);
- oSub.HUpperlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HUpperlimit].Value);
- oSub.HLowerlimit = ClsPub.isDoule(grdMain.Rows[i].Cells[HLowerlimit].Value);
+ oSub.HMaterID = ClsPub.isLong(grdMain1.Rows[i].Cells[HMaterIDCol].Value);
+ oSub.HProcID = ClsPub.isLong(grdMain1.Rows[i].Cells[HProcIDCol].Value);
+ oSub.HStdWorkTimes = ClsPub.isDoule(grdMain1.Rows[i].Cells[HStdWorkTimes].Value);
+ oSub.HUpperlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HUpperlimit].Value);
+ oSub.HLowerlimit = ClsPub.isDoule(grdMain1.Rows[i].Cells[HLowerlimit].Value);
oSub.HUSEORGID = ClsPub.HOrgID;
- oSub.HStopflag = true;
+ oSub.HStopflag = false;
oSub.HMaker = ClsPub.CurUserName;
oSub.HMakeDate = DateTime.Today.ToString();
- oSub.HRemark = ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
+ oSub.HRemark = ClsPub.isStrNull(grdMain1.Rows[i].Cells[HRemarkCol].Value);
BillNew.DetailColl.Add(oSub);
}
}
@@ -568,28 +563,28 @@
//鍒濆鍖朑RID
private void initGrid()
{
- grdMain.ColumnCount = 22; //鎬诲垪鏁�
- DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain1.ColumnCount = 22; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain1, this.Name);
//
- grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
- grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
- grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
- grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
- grdMain.Columns[HProcIDCol].HeaderText = "宸ュ簭ID";
- grdMain.Columns[HProcNumberCol].HeaderText = "宸ュ簭浠ｇ爜";
- grdMain.Columns[HProcNameCol].HeaderText = "宸ュ簭鍚嶇О";
+ grdMain1.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain1.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain1.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain1.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain1.Columns[HProcIDCol].HeaderText = "宸ュ簭ID";
+ grdMain1.Columns[HProcNumberCol].HeaderText = "宸ュ簭浠ｇ爜";
+ grdMain1.Columns[HProcNameCol].HeaderText = "宸ュ簭鍚嶇О";
- grdMain.Columns[HStdWorkTimes].HeaderText = "鏍囧噯宸ユ椂";
- grdMain.Columns[HUpperlimit].HeaderText = "涓婇檺姣斾緥";
- grdMain.Columns[HLowerlimit].HeaderText = "涓嬮檺姣斾緥";
- grdMain.Columns[HUSEORGID].HeaderText = "缁勭粐ID";
- grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain1.Columns[HStdWorkTimes].HeaderText = "鏍囧噯宸ユ椂";
+ grdMain1.Columns[HUpperlimit].HeaderText = "涓婇檺姣斾緥";
+ grdMain1.Columns[HLowerlimit].HeaderText = "涓嬮檺姣斾緥";
+ grdMain1.Columns[HUSEORGID].HeaderText = "缁勭粐ID";
+ grdMain1.Columns[HRemarkCol].HeaderText = "澶囨敞";
//
//闅愯棌鍒�
- grdMain.Columns[HTagCol].Visible = false;
- grdMain.Columns[HProcIDCol].Visible = false;
- grdMain.Columns[HMaterIDCol].Visible = false;
- grdMain.Columns[HUSEORGID].Visible = false;
+ grdMain1.Columns[HTagCol].Visible = false;
+ grdMain1.Columns[HProcIDCol].Visible = false;
+ grdMain1.Columns[HMaterIDCol].Visible = false;
+ grdMain1.Columns[HUSEORGID].Visible = false;
//鍙紪杈戝垪
string sAllowCol = HMaterNumberCol.ToString() +
"," + HProcNumberCol.ToString() +
@@ -664,7 +659,7 @@
//鏄惁鏄┖琛�
private bool IsNullRow(int Row)
{
- if (ClsPub.isInt(grdMain.Rows[Row].Cells[HMaterIDCol].Value) == 0)
+ if (ClsPub.isInt(grdMain1.Rows[Row].Cells[HMaterIDCol].Value) == 0)
{
return true;
}
@@ -708,26 +703,26 @@
{
case HMaterNumberCol:
//BLL.ClsBaseSelect_K3.SetGridByMater_K3(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
- BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
+ BLL.ClsBaseSelect_InterFace.SetGridByMater(grdMain1, sRow, HMaterIDCol, HMaterNumberCol, HMaterNameCol, HMaterModelCol, 0, 0, 0);
if (rbHSelectCus.Checked)
{
- grdMain.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
- grdMain.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
- grdMain.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HProcIDCol].Value = txtHProcID.Tag.ToString();
+ grdMain1.Rows[sRow].Cells[HProcNameCol].Value = txtHProcName.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HProcNumberCol].Value = txtHProcID.Text.Trim();
}
- oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HMaterNumberCol].Value);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value);
break;
case HProcNumberCol:
//BLL.ClsBaseSelect.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
- BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
+ BLL.ClsBaseSelect_InterFace.SetGridByProc(grdMain1, sRow, HProcIDCol, HProcNumberCol, HProcNameCol);
if (rbHSelectMater.Checked)
{
- grdMain.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
- grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
- grdMain.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
- grdMain.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterIDCol].Value = txtHMaterID.Tag.ToString();
+ grdMain1.Rows[sRow].Cells[HMaterNumberCol].Value = txtHMaterID.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterNameCol].Value = txtHMaterName.Text.Trim();
+ grdMain1.Rows[sRow].Cells[HMaterModelCol].Value = txtHMaterModel.Text.Trim();
}
- oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HProcNumberCol].Value);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain1.Rows[sRow].Cells[HProcNumberCol].Value);
break;
default:
break;
@@ -745,7 +740,7 @@
DataGridViewTextBoxEditingControl EditingControl;
private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
{
- int i = grdMain.CurrentCell.ColumnIndex;
+ int i = grdMain1.CurrentCell.ColumnIndex;
if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid, i))
{
e.Cancel = true;
@@ -783,7 +778,7 @@
private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
{
- if (grdMain.CurrentCell != null)
+ if (grdMain1.CurrentCell != null)
{
if (e.Control is DataGridViewTextBoxEditingControl)
{
@@ -797,7 +792,7 @@
private void EditingControl_KeyDown(object sender, KeyEventArgs e)
{
//涓氬姟澶勭悊
- Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+ Sub_GridKey(e.KeyValue, grdMain1.CurrentRow.Index, grdMain1.CurrentCell.ColumnIndex, EditingControl);
}
private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
--
Gitblit v1.9.1