yangzw
/
LanPrintinc_Wuxi_MES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.工艺维护主界面增加 '工艺变更说明' 入口 

2.关联工序功能界面，工艺路线名称引用错误
master
yangzw 3 years ago
parent
bf1dae521f
commit
cd238c86bf
5 changed files with 102 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.cs
  2. 100
      ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.designer.cs
  3. 17
      ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.resx
  4. 2
      ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTECRAdd.designer.cs
  5. 6
      ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormTBLROUTE2OP.designer.cs

31
ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.cs
View File

@ -653,5 +653,36 @@ namespace ICSSoft.Frame.APP
}
}
#endregion
private void btnChangeRecord_Click(object sender, EventArgs e)
{
SimpleButton btntemp = (SimpleButton)sender;
if (AppConfig.GetUserExcuteRight(this.Tag.ToString(), btntemp.Name) == false)
{
ICSBaseSimpleCode.AppshowMessageBox("对不起您没有:" + btntemp.Text + "权限,请联系系统管理员！");
return;
}
string ROUTECODE = "";
for (int i = 0; i < grvDetail.RowCount; i++)
{
if (grvDetail.GetRowCellValue(i, colisSelect).ToString() == "Y")
{
if (!string.IsNullOrEmpty(ROUTECODE))
{
ICSBaseSimpleCode.AppshowMessageBox("只能选取一条记录");
return;
}
ROUTECODE = grvDetail.GetRowCellValue(i, colROUTECODE).ToString();
}
}
if (string.IsNullOrEmpty(ROUTECODE))
{
ICSBaseSimpleCode.AppshowMessageBox("请选取一条记录");
return;
}
FormICSROUTECRAdd add = new FormICSROUTECRAdd(ROUTECODE);
add.ShowDialog();
btnRefresh_Click(null, null);
}
}
}

100
ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.designer.cs
View File

@ -31,7 +31,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormICSROUTE));
this.btnOutPut = new DevExpress.XtraEditors.SimpleButton();
this.btnConfig = new DevExpress.XtraEditors.SimpleButton();
this.btnExit = new DevExpress.XtraEditors.SimpleButton();
this.btnClose = new DevExpress.XtraEditors.SimpleButton();
this.btnFilter = new DevExpress.XtraEditors.SimpleButton();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.btnImportMould = new DevExpress.XtraEditors.SimpleButton();
@ -44,7 +44,6 @@
this.btnSelectAll = new DevExpress.XtraEditors.SimpleButton();
this.lblTitle = new DevExpress.XtraEditors.LabelControl();
this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
this.btnClose = new DevExpress.XtraEditors.SimpleButton();
this.rptPage = new ICSSoft.Base.UserControl.FormControl.PageNavTool();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.grdDetail = new DevExpress.XtraGrid.GridControl();
@ -60,6 +59,7 @@
this.colMUSERName = new DevExpress.XtraGrid.Columns.GridColumn();
this.colMTIME = new DevExpress.XtraGrid.Columns.GridColumn();
this.grvAdvDetail = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
this.btnChangeRecord = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
this.panelControl3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
@ -78,11 +78,11 @@
this.btnOutPut.Appearance.Options.UseTextOptions = true;
this.btnOutPut.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnOutPut.Image = ((System.Drawing.Image)(resources.GetObject("btnOutPut.Image")));
this.btnOutPut.Location = new System.Drawing.Point(530, 0);
this.btnOutPut.Location = new System.Drawing.Point(926, 0);
this.btnOutPut.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnOutPut.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnOutPut.Name = "btnOutPut";
this.btnOutPut.Size = new System.Drawing.Size(63, 30);
this.btnOutPut.Size = new System.Drawing.Size(50, 30);
this.btnOutPut.TabIndex = 2;
this.btnOutPut.Text = "导出";
this.btnOutPut.Click += new System.EventHandler(this.btnOutPut_Click);
@ -105,23 +105,24 @@
this.btnConfig.Text = "数据源设置";
this.btnConfig.Click += new System.EventHandler(this.btnConfig_Click);
//
// btnExit
//
this.btnExit.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnExit.Appearance.ForeColor = System.Drawing.Color.White;
this.btnExit.Appearance.Options.UseFont = true;
this.btnExit.Appearance.Options.UseForeColor = true;
this.btnExit.Appearance.Options.UseTextOptions = true;
this.btnExit.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image")));
this.btnExit.Location = new System.Drawing.Point(897, 0);
this.btnExit.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnExit.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(55, 30);
this.btnExit.TabIndex = 10;
this.btnExit.Text = "退出";
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
// btnClose
//
this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClose.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnClose.Appearance.ForeColor = System.Drawing.Color.White;
this.btnClose.Appearance.Options.UseFont = true;
this.btnClose.Appearance.Options.UseForeColor = true;
this.btnClose.Appearance.Options.UseTextOptions = true;
this.btnClose.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnClose.Image = ((System.Drawing.Image)(resources.GetObject("btnClose.Image")));
this.btnClose.Location = new System.Drawing.Point(981, 0);
this.btnClose.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnClose.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(55, 30);
this.btnClose.TabIndex = 10;
this.btnClose.Text = "退出";
this.btnClose.Click += new System.EventHandler(this.btnExit_Click);
//
// btnFilter
//
@ -150,15 +151,15 @@
this.panelControl3.Controls.Add(this.btnImportData);
this.panelControl3.Controls.Add(this.btnTBLOP);
this.panelControl3.Controls.Add(this.btnModify);
this.panelControl3.Controls.Add(this.btnChangeRecord);
this.panelControl3.Controls.Add(this.btnCreate);
this.panelControl3.Controls.Add(this.btnCancelAll);
this.panelControl3.Controls.Add(this.btnDel);
this.panelControl3.Controls.Add(this.btnSelectAll);
this.panelControl3.Controls.Add(this.lblTitle);
this.panelControl3.Controls.Add(this.btnRefresh);
this.panelControl3.Controls.Add(this.btnClose);
this.panelControl3.Controls.Add(this.btnFilter);
this.panelControl3.Controls.Add(this.btnExit);
this.panelControl3.Controls.Add(this.btnClose);
this.panelControl3.Controls.Add(this.btnConfig);
this.panelControl3.Controls.Add(this.btnOutPut);
this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
@ -176,13 +177,13 @@
this.btnImportMould.Appearance.Options.UseTextOptions = true;
this.btnImportMould.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnImportMould.Image = ((System.Drawing.Image)(resources.GetObject("btnImportMould.Image")));
this.btnImportMould.Location = new System.Drawing.Point(734, 0);
this.btnImportMould.Location = new System.Drawing.Point(802, 0);
this.btnImportMould.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnImportMould.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnImportMould.Name = "btnImportMould";
this.btnImportMould.Size = new System.Drawing.Size(100, 30);
this.btnImportMould.Size = new System.Drawing.Size(76, 30);
this.btnImportMould.TabIndex = 55;
this.btnImportMould.Text = "导入模板下载";
this.btnImportMould.Text = "导入模板";
this.btnImportMould.Click += new System.EventHandler(this.btnImportMould_Click);
//
// btnImportData
@ -194,11 +195,11 @@
this.btnImportData.Appearance.Options.UseTextOptions = true;
this.btnImportData.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnImportData.Image = ((System.Drawing.Image)(resources.GetObject("btnImportData.Image")));
this.btnImportData.Location = new System.Drawing.Point(834, 0);
this.btnImportData.Location = new System.Drawing.Point(877, 0);
this.btnImportData.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnImportData.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnImportData.Name = "btnImportData";
this.btnImportData.Size = new System.Drawing.Size(63, 30);
this.btnImportData.Size = new System.Drawing.Size(50, 30);
this.btnImportData.TabIndex = 56;
this.btnImportData.Text = "导入";
this.btnImportData.Click += new System.EventHandler(this.btnImportData_Click);
@ -212,7 +213,7 @@
this.btnTBLOP.Appearance.Options.UseTextOptions = true;
this.btnTBLOP.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnTBLOP.Image = ((System.Drawing.Image)(resources.GetObject("btnTBLOP.Image")));
this.btnTBLOP.Location = new System.Drawing.Point(651, 0);
this.btnTBLOP.Location = new System.Drawing.Point(660, 0);
this.btnTBLOP.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnTBLOP.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnTBLOP.Name = "btnTBLOP";
@ -331,7 +332,7 @@
this.btnRefresh.Appearance.Options.UseTextOptions = true;
this.btnRefresh.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnRefresh.Image = ((System.Drawing.Image)(resources.GetObject("btnRefresh.Image")));
this.btnRefresh.Location = new System.Drawing.Point(593, 0);
this.btnRefresh.Location = new System.Drawing.Point(602, 0);
this.btnRefresh.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnRefresh.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnRefresh.Name = "btnRefresh";
@ -340,23 +341,6 @@
this.btnRefresh.Text = "刷新";
this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
//
// btnClose
//
this.btnClose.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnClose.Appearance.ForeColor = System.Drawing.Color.White;
this.btnClose.Appearance.Options.UseFont = true;
this.btnClose.Appearance.Options.UseForeColor = true;
this.btnClose.Appearance.Options.UseTextOptions = true;
this.btnClose.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
this.btnClose.Location = new System.Drawing.Point(1010, 0);
this.btnClose.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnClose.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(26, 30);
this.btnClose.TabIndex = 14;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// rptPage
//
this.rptPage.Appearance.BackColor = System.Drawing.Color.White;
@ -522,6 +506,24 @@
this.grvAdvDetail.OptionsView.ShowFooter = true;
this.grvAdvDetail.OptionsView.ShowGroupPanel = false;
//
// btnChangeRecord
//
this.btnChangeRecord.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnChangeRecord.Appearance.ForeColor = System.Drawing.Color.White;
this.btnChangeRecord.Appearance.Options.UseFont = true;
this.btnChangeRecord.Appearance.Options.UseForeColor = true;
this.btnChangeRecord.Appearance.Options.UseTextOptions = true;
this.btnChangeRecord.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btnChangeRecord.Image = ((System.Drawing.Image)(resources.GetObject("btnChangeRecord.Image")));
this.btnChangeRecord.Location = new System.Drawing.Point(529, 0);
this.btnChangeRecord.LookAndFeel.SkinName = "BlueButtonSkin";
this.btnChangeRecord.LookAndFeel.UseDefaultLookAndFeel = false;
this.btnChangeRecord.Name = "btnChangeRecord";
this.btnChangeRecord.Size = new System.Drawing.Size(74, 30);
this.btnChangeRecord.TabIndex = 23;
this.btnChangeRecord.Text = "变更说明";
this.btnChangeRecord.Click += new System.EventHandler(this.btnChangeRecord_Click);
//
// FormICSROUTE
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@ -550,10 +552,9 @@
private DevExpress.XtraEditors.SimpleButton btnOutPut;
private DevExpress.XtraEditors.SimpleButton btnConfig;
private DevExpress.XtraEditors.SimpleButton btnExit;
private DevExpress.XtraEditors.SimpleButton btnClose;
private DevExpress.XtraEditors.SimpleButton btnFilter;
private DevExpress.XtraEditors.PanelControl panelControl3;
private DevExpress.XtraEditors.SimpleButton btnClose;
private DevExpress.XtraEditors.SimpleButton btnRefresh;
private DevExpress.XtraEditors.LabelControl lblTitle;
private DevExpress.XtraEditors.SimpleButton btnCreate;
@ -579,5 +580,6 @@
private DevExpress.XtraEditors.SimpleButton btnTBLOP;
private DevExpress.XtraEditors.SimpleButton btnImportMould;
private DevExpress.XtraEditors.SimpleButton btnImportData;
private DevExpress.XtraEditors.SimpleButton btnChangeRecord;
}
}

17
ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTE.resx
View File

@ -148,7 +148,7 @@
fzQgb/KC0b+zAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="btnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIcAAAAAAP////r6+/n5+t/l8ejs9Ovu9PL0+Pf4+vb3+SROniVQnyROnCZSoiZRoCdU
oydUoihSoSlVpDxkq+Dm8eru9ent9BtQoyVUoyhXpSlYpU92tnSUxpmw1bnJ47jI4rvL5M3Y6tnh7uLo
@ -246,6 +246,21 @@
J1uclEljpo0ggSSm/BjSI0gOHGiYOh1YAggUJF6SZm36lOsTHjl07ACk5sxWgiW4HHFiBAugAG8EKSho
QgudOXLiBBoD4AaBgiqyNLlSxMoSJUlqDEDMBM4dO3rw5KkzQwDiECJAfLBBI8YLGAYKVqAgYUKEBwgO
NGAAoWBAADs=
</value>
</data>
<data name="btnChangeRecord.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAILSURBVDhPpZPfSxRRFMfvv9Gbj7300JPQnyBBSA9F
RO2ameTiZmKwuxFILbu0qyuLFopFlCSSLyNa7GhRFGE/6Idt0S97ChW1tNmdnR93Zr+dc3enXqSwDnw4
cy/nfO7lzIwA8F+I5q6Jjj5tsZwY/4z4TWLsI2LX3+PMtbfouVpE95UFnB55iVPDLxC99AyRwSeIjzwq
c58SJCcX/XxhBdslOvDAVwI++V9oy9ynfhLExz7xw7bjWOouJyFiNz6oDUd6sAnLkShbEoblYtN08K1k
YXWjguU1E19XS/iybKj6UFLnRAIaGIfr+3A9T4kqroRp10Q/KhLfyzbWDBJtWlhZr6j6I713OAnB0+bw
SCBZQjgkskhk8m1IVOIbmRIbJRfrhq3qD5+b4SQEvyoOr1pVgkDkEDaLSBKIjLqI49DZKU5CdI++Vhss
CGBBcBubZVJiZn4SPcMhtPXvQ/hiE5pjXTVB9PLzmoDgF/tLQqi5ENrjcfTeCmO6OIRXSzpysydxILcL
jR07sqJz8KkScFQJlvh1SUBLpgnamwFo7/KqLjt3HLm5EyywRCQ/rzb/FHsTu3G7OFpf1WJqYYgF4H9h
or3/ofqyWtP3EE7O4uj5Ak15Wg3qYELDnkgDMnoLUnpINacKod83oPVfocIL+7M70ae3qpM581rNYKuG
raDiNGEQ3Mg5DUD8BNuUO/b0w6B3AAAAAElFTkSuQmCC
</value>
</data>
<data name="btnCreate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormICSROUTECRAdd.designer.cs
View File

@ -167,7 +167,7 @@
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(60, 14);
this.labelControl3.TabIndex = 0;
this.labelControl3.Text = "工艺名称：";
this.labelControl3.Text = "变更说明：";
//
// can
//

6
ICSSoft.AppSln/ICSSoft.AppSln/ICSSoft.Frame.APP/ProcessFlow/FormTBLROUTE2OP.designer.cs
View File

@ -175,7 +175,7 @@
//
// colROUTECODE
//
this.colROUTECODE.Caption = "途程代码";
this.colROUTECODE.Caption = "工艺代码";
this.colROUTECODE.FieldName = "ROUTECODE";
this.colROUTECODE.Name = "colROUTECODE";
this.colROUTECODE.OptionsColumn.ReadOnly = true;
@ -344,8 +344,8 @@
//
// colROUTEDESC
//
this.colROUTEDESC.Caption = "途程描述";
this.colROUTEDESC.FieldName = "途程描述";
this.colROUTEDESC.Caption = "工艺描述";
this.colROUTEDESC.FieldName = "ROUTEDESC";
this.colROUTEDESC.Name = "colROUTEDESC";
this.colROUTEDESC.OptionsColumn.ReadOnly = true;
this.colROUTEDESC.Visible = true;

Write Preview
|||||||
100:0
Loading…
Cancel
Save