DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -120,7 +120,7 @@ this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true; this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date"; this.gvMx1lastupdateDate.Visible = true; this.gvMx1lastupdateDate.VisibleIndex = 3; this.gvMx1lastupdateDate.VisibleIndex = 4; this.gvMx1lastupdateDate.Width = 180; // // gvMx1lastupdateBy @@ -134,7 +134,7 @@ this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true; this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by"; this.gvMx1lastupdateBy.Visible = true; this.gvMx1lastupdateBy.VisibleIndex = 4; this.gvMx1lastupdateBy.VisibleIndex = 3; this.gvMx1lastupdateBy.Width = 94; // // gvMx1description DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -86,27 +86,6 @@ } /// <summary> /// 反审核 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { _toolCk(0); } /// <summary> /// 审核事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { _toolCk(1); } /// <summary> /// 取消事件 /// </summary> /// <param name="sender"></param> @@ -169,7 +148,6 @@ } /// <summary> /// 保存事件 /// </summary> @@ -197,7 +175,8 @@ for (var i = 0; i < gvMx1.DataRowCount; i++) { var row = gvMx1.GetDataRow(i); if (row != null) { if (row != null) { if (string.IsNullOrEmpty(row["depotSectionCode"].ToString())) { MsgHelper.ShowError("编码不能为空！"); @@ -240,6 +219,7 @@ var gridViews = new List<GridView>(); gridViews.Add(gvMx1); UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews); toolBarMenu1.currentAction = ""; } } catch (Exception ex) @@ -318,14 +298,11 @@ lbGuid.Text = strGuid; var gvList = new List<GridView>(); gvList.Add(gvMx1); UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList); UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList); var _job = JObject.Parse(strJson); var array = new JArray(); foreach (var a in _job["rtnData"]["list"]) array.Add(a); var dt = JsonConvert.DeserializeObject<DataTable>( array.ToString()); var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); if (dt.Rows.Count > 0) { gcMx1.BindingContext = new BindingContext(); @@ -386,61 +363,5 @@ } } } /// <summary> /// 工具条事件 /// </summary> /// <param name="inFieldValue"></param> private void _toolCk(int _inFieldValue) { string strMsg = ""; switch (_inFieldValue) { case 1: strMsg = "审核"; break; case 0: strMsg = "反审核"; break; }; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_depotName, gridView1, "depotName"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？")) return; var _obj = new { guid = rowGuid, ckValue = _inFieldValue, parameter = "MES_DEPOTS,check_date,check_status,check_by" }; try { var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -180,9 +180,5 @@ MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -9,7 +9,6 @@ using Gs.DevApp.UserControl; using Newtonsoft.Json; namespace Gs.DevApp.DevFrm { public partial class Frm_MesUnit : XtraForm @@ -35,7 +34,6 @@ getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -86,9 +86,9 @@ // this.lb_isZxbg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_isZxbg.Appearance.Options.UseFont = true; this.lb_isZxbg.Location = new System.Drawing.Point(328, 116); this.lb_isZxbg.Location = new System.Drawing.Point(333, 116); this.lb_isZxbg.Name = "lb_isZxbg"; this.lb_isZxbg.Size = new System.Drawing.Size(73, 21); this.lb_isZxbg.Size = new System.Drawing.Size(68, 21); this.lb_isZxbg.TabIndex = 243; this.lb_isZxbg.Text = "整线报工 "; // @@ -110,9 +110,9 @@ // this.lb_lineType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lineType.Appearance.Options.UseFont = true; this.lb_lineType.Location = new System.Drawing.Point(328, 84); this.lb_lineType.Location = new System.Drawing.Point(333, 84); this.lb_lineType.Name = "lb_lineType"; this.lb_lineType.Size = new System.Drawing.Size(73, 21); this.lb_lineType.Size = new System.Drawing.Size(68, 21); this.lb_lineType.TabIndex = 240; this.lb_lineType.Text = "线体类别 "; // @@ -134,9 +134,9 @@ // this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateDate.Appearance.Options.UseFont = true; this.lb_lastupdateDate.Location = new System.Drawing.Point(328, 52); this.lb_lastupdateDate.Location = new System.Drawing.Point(333, 52); this.lb_lastupdateDate.Name = "lb_lastupdateDate"; this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21); this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21); this.lb_lastupdateDate.TabIndex = 231; this.lb_lastupdateDate.Text = "更新时间 "; // @@ -168,9 +168,9 @@ // this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateBy.Appearance.Options.UseFont = true; this.lb_lastupdateBy.Location = new System.Drawing.Point(345, 20); this.lb_lastupdateBy.Location = new System.Drawing.Point(350, 20); this.lb_lastupdateBy.Name = "lb_lastupdateBy"; this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21); this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21); this.lb_lastupdateBy.TabIndex = 228; this.lb_lastupdateBy.Text = "更新者 "; // @@ -230,9 +230,9 @@ // this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark.Appearance.Options.UseFont = true; this.lb_remark.Location = new System.Drawing.Point(49, 116); this.lb_remark.Location = new System.Drawing.Point(54, 116); this.lb_remark.Name = "lb_remark"; this.lb_remark.Size = new System.Drawing.Size(39, 21); this.lb_remark.Size = new System.Drawing.Size(34, 21); this.lb_remark.TabIndex = 219; this.lb_remark.Text = "备注 "; // @@ -263,9 +263,9 @@ // this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_name.Appearance.Options.UseFont = true; this.lb_name.Location = new System.Drawing.Point(15, 84); this.lb_name.Location = new System.Drawing.Point(20, 84); this.lb_name.Name = "lb_name"; this.lb_name.Size = new System.Drawing.Size(73, 21); this.lb_name.Size = new System.Drawing.Size(68, 21); this.lb_name.TabIndex = 217; this.lb_name.Text = "产线名称 "; // @@ -296,9 +296,9 @@ // this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lineNo.Appearance.Options.UseFont = true; this.lb_lineNo.Location = new System.Drawing.Point(15, 52); this.lb_lineNo.Location = new System.Drawing.Point(20, 52); this.lb_lineNo.Name = "lb_lineNo"; this.lb_lineNo.Size = new System.Drawing.Size(73, 21); this.lb_lineNo.Size = new System.Drawing.Size(68, 21); this.lb_lineNo.TabIndex = 216; this.lb_lineNo.Text = "产线编号 "; // @@ -536,6 +536,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesWorkshopLine"; this.Text = "线体管理"; ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -37,6 +37,7 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; this.txt_dptId.getSuppler(""); } private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -166,7 +167,14 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); } } /// <summary> /// 新增事件 @@ -312,7 +320,6 @@ dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -15,7 +15,6 @@ { private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesStaffManager/"; public Frm_Staff() { InitializeComponent(); @@ -145,7 +144,6 @@ { MsgHelper.Warning("提示：" + ex.Message); } } private void getModel(string strGuid) DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -53,10 +53,9 @@ this.txt_isIncludeDoc = new DevExpress.XtraEditors.CheckEdit(); this.txt_isSpilit = new DevExpress.XtraEditors.CheckEdit(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit(); this.txxtItem5 = new DevExpress.XtraEditors.ComboBoxEdit(); this.labelControl9 = new DevExpress.XtraEditors.LabelControl(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.lblPreview = new DevExpress.XtraEditors.LabelControl(); this.txxtItem4 = new DevExpress.XtraEditors.ComboBoxEdit(); this.txxtItem3 = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_docFormat = new DevExpress.XtraEditors.TextEdit(); @@ -73,6 +72,8 @@ this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -86,7 +87,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isSpilit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); this.panelControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem5.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).BeginInit(); @@ -230,7 +231,7 @@ this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(947, 510); this.gcMain.Size = new System.Drawing.Size(1072, 510); this.gcMain.TabIndex = 1; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -251,7 +252,9 @@ this.gv_resetZero, this.gv_flagIncludeDocCode, this.gv_createdBy, this.gv_createDate}); this.gv_createDate, this.gridColumn1, this.gridColumn2}); this.gridView1.GridControl = this.gcMain; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; @@ -288,7 +291,7 @@ this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.pageBar1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(947, 548); this.xtraTabPage1.Size = new System.Drawing.Size(1072, 548); this.xtraTabPage1.Text = "数据列表"; // // pageBar1 @@ -299,7 +302,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.Size = new System.Drawing.Size(947, 38); this.pageBar1.Size = new System.Drawing.Size(1072, 38); this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // @@ -333,30 +336,30 @@ // // txt_resetZero // this.txt_resetZero.Location = new System.Drawing.Point(166, 336); this.txt_resetZero.Location = new System.Drawing.Point(162, 268); this.txt_resetZero.Name = "txt_resetZero"; this.txt_resetZero.Properties.Caption = "每天归零重新编号"; this.txt_resetZero.Size = new System.Drawing.Size(159, 24); this.txt_resetZero.Size = new System.Drawing.Size(153, 24); this.txt_resetZero.TabIndex = 238; // // txt_noLength // this.txt_noLength.Location = new System.Drawing.Point(166, 285); this.txt_noLength.Location = new System.Drawing.Point(162, 228); this.txt_noLength.Maximum = new decimal(new int[] { 10, 0, 0, 0}); this.txt_noLength.Minimum = new decimal(new int[] { 3, 6, 0, 0, 0}); this.txt_noLength.Name = "txt_noLength"; this.txt_noLength.Size = new System.Drawing.Size(159, 28); this.txt_noLength.Size = new System.Drawing.Size(136, 28); this.txt_noLength.TabIndex = 237; this.txt_noLength.Value = new decimal(new int[] { 3, 6, 0, 0, 0}); @@ -385,7 +388,7 @@ // // txt_isIncludeDoc // this.txt_isIncludeDoc.Location = new System.Drawing.Point(372, 336); this.txt_isIncludeDoc.Location = new System.Drawing.Point(329, 268); this.txt_isIncludeDoc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txt_isIncludeDoc.Name = "txt_isIncludeDoc"; this.txt_isIncludeDoc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -396,7 +399,7 @@ // // txt_isSpilit // this.txt_isSpilit.Location = new System.Drawing.Point(372, 287); this.txt_isSpilit.Location = new System.Drawing.Point(329, 230); this.txt_isSpilit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txt_isSpilit.Name = "txt_isSpilit"; this.txt_isSpilit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -412,10 +415,9 @@ this.panelControl1.Appearance.Options.UseBackColor = true; this.panelControl1.Appearance.Options.UseForeColor = true; this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.panelControl1.Controls.Add(this.comboBoxEdit1); this.panelControl1.Controls.Add(this.txxtItem5); this.panelControl1.Controls.Add(this.labelControl9); this.panelControl1.Controls.Add(this.labelControl1); this.panelControl1.Controls.Add(this.lblPreview); this.panelControl1.Controls.Add(this.txxtItem4); this.panelControl1.Controls.Add(this.txxtItem3); this.panelControl1.Controls.Add(this.txt_docFormat); @@ -429,24 +431,24 @@ this.panelControl1.Location = new System.Drawing.Point(81, 73); this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panelControl1.Name = "panelControl1"; this.panelControl1.Size = new System.Drawing.Size(780, 188); this.panelControl1.Size = new System.Drawing.Size(780, 137); this.panelControl1.TabIndex = 229; // // comboBoxEdit1 // txxtItem5 // this.comboBoxEdit1.EditValue = "序号"; this.comboBoxEdit1.Location = new System.Drawing.Point(617, 48); this.comboBoxEdit1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.comboBoxEdit1.Name = "comboBoxEdit1"; this.comboBoxEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.comboBoxEdit1.Properties.Appearance.Options.UseFont = true; this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { this.txxtItem5.Location = new System.Drawing.Point(617, 48); this.txxtItem5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txxtItem5.Name = "txxtItem5"; this.txxtItem5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txxtItem5.Properties.Appearance.Options.UseFont = true; this.txxtItem5.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.comboBoxEdit1.Properties.Items.AddRange(new object[] { "序号"}); this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.comboBoxEdit1.Size = new System.Drawing.Size(122, 28); this.comboBoxEdit1.TabIndex = 4; this.txxtItem5.Properties.Items.AddRange(new object[] { "<无>", "<序号>"}); this.txxtItem5.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txxtItem5.Size = new System.Drawing.Size(122, 28); this.txxtItem5.TabIndex = 4; // // labelControl9 // @@ -469,19 +471,6 @@ this.labelControl1.Size = new System.Drawing.Size(60, 21); this.labelControl1.TabIndex = 0; this.labelControl1.Text = "参数1："; // // lblPreview // this.lblPreview.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); this.lblPreview.Appearance.ForeColor = System.Drawing.Color.White; this.lblPreview.Appearance.Options.UseFont = true; this.lblPreview.Appearance.Options.UseForeColor = true; this.lblPreview.Location = new System.Drawing.Point(50, 139); this.lblPreview.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lblPreview.Name = "lblPreview"; this.lblPreview.Size = new System.Drawing.Size(269, 24); this.lblPreview.TabIndex = 0; this.lblPreview.Text = "样例：XX20150506-00001"; // // txxtItem4 // @@ -647,7 +636,7 @@ // this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl6.Appearance.Options.UseFont = true; this.labelControl6.Location = new System.Drawing.Point(81, 289); this.labelControl6.Location = new System.Drawing.Point(77, 232); this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl6.Name = "labelControl6"; this.labelControl6.Size = new System.Drawing.Size(85, 21); @@ -663,7 +652,10 @@ this.txt_docCode.Properties.Appearance.Options.UseFont = true; this.txt_docCode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_docCode.Properties.NullText = ""; this.txt_docCode.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { new DevExpress.XtraEditors.Controls.LookUpColumnInfo("docCode", "单据类型", 20, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.Ascending, DevExpress.Utils.DefaultBoolean.Default)}); this.txt_docCode.Properties.DropDownRows = 15; this.txt_docCode.Properties.NullText = "请选择单据类型"; this.txt_docCode.Size = new System.Drawing.Size(248, 28); this.txt_docCode.TabIndex = 224; // @@ -697,6 +689,26 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // gridColumn1 // this.gridColumn1.Caption = "审核者"; this.gridColumn1.FieldName = "checkBy"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 9; this.gridColumn1.Width = 94; // // gridColumn2 // this.gridColumn2.Caption = "审核日期"; this.gridColumn2.FieldName = "checkDate"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 10; this.gridColumn2.Width = 94; // // DocNoRule // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -722,7 +734,7 @@ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); this.panelControl1.ResumeLayout(false); this.panelControl1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem5.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).EndInit(); @@ -757,7 +769,6 @@ private DevExpress.XtraEditors.CheckEdit txt_isSpilit; private DevExpress.XtraEditors.PanelControl panelControl1; private DevExpress.XtraEditors.LabelControl labelControl1; private DevExpress.XtraEditors.LabelControl lblPreview; private DevExpress.XtraEditors.ComboBoxEdit txxtItem4; private DevExpress.XtraEditors.ComboBoxEdit txxtItem3; private DevExpress.XtraEditors.TextEdit txt_docFormat; @@ -776,7 +787,9 @@ private DevExpress.XtraEditors.CheckEdit txt_resetZero; private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus; private System.Windows.Forms.PictureBox picCheckBox; private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1; private DevExpress.XtraEditors.LabelControl labelControl9; private DevExpress.XtraEditors.ComboBoxEdit txxtItem5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } } DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -42,6 +42,7 @@ txxtItem2.EditValueChanged += (s, e) => { DoPreviewCode(); }; txxtItem3.EditValueChanged += (s, e) => { DoPreviewCode(); }; txxtItem4.EditValueChanged += (s, e) => { DoPreviewCode(); }; txxtItem5.EditValueChanged += (s, e) => { DoPreviewCode(); }; txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); }; txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); }; txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); }; @@ -170,8 +171,15 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true; } txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true; } /// <summary> @@ -185,9 +193,10 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); UtilityHelper.CleanValueByControl(panel1.Controls, true); txxtItem1.SelectedIndex = txxtItem2.SelectedIndex = txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0; txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = txxtItem5.SelectedIndex = 0; txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true; txxtItem4.Enabled = txxtItem5.Enabled = panelControl1.Enabled = true; txt_docCode.EditValue = null; } /// <summary> @@ -321,6 +330,8 @@ txxtItem3.Text = "<" + _ary[2]; if (_ary.Length > 3) txxtItem4.Text = "<" + _ary[3]; if (_ary.Length >4) txxtItem5.Text = "<" + _ary[4]; txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = false; } else @@ -338,19 +349,36 @@ { var dataTable = new DataTable(); dataTable.Columns.Add("docCode", typeof(string)); dataTable.Rows.Add("CGDH(到货单)");//V dataTable.Rows.Add("CGJY(检验单)");//V dataTable.Rows.Add("DBSQ(调拨申请单)");//V dataTable.Rows.Add("GDPC(工单排产)");//V dataTable.Rows.Add("WWPC(委外排产)");//V dataTable.Rows.Add("CKSQ(出库申请)");//V dataTable.Rows.Add("RKSQ(入库申请)");//V dataTable.Rows.Add("TL(退料单)"); dataTable.Rows.Add("IN(入库单)"); dataTable.Rows.Add("SC(生产工单)"); dataTable.Rows.Add("OUT(出库单)"); dataTable.Rows.Add("HB(物料合并)"); dataTable.Rows.Add("QTSQ(其他入库申请)"); dataTable.Rows.Add("BG(报工编号)"); dataTable.Rows.Add("CGDH(到货)"); dataTable.Rows.Add("CGJY(采购检验)"); dataTable.Rows.Add("CGRK(采购入库)"); dataTable.Rows.Add("CGTHSQ(采购退货申请)"); dataTable.Rows.Add("CGTH(采购退货)"); dataTable.Rows.Add("DBSQ(调拨申请)"); dataTable.Rows.Add("DB(调拨单)"); dataTable.Rows.Add("GDPC(工单排产)"); dataTable.Rows.Add("QTCKSQ(其他出库申请)"); dataTable.Rows.Add("QTCK(其他出库)"); dataTable.Rows.Add("QTRKSQ(其他入库申请)"); dataTable.Rows.Add("QTRK(其他入库)"); dataTable.Rows.Add("SCLL(生产领料)"); dataTable.Rows.Add("SCRK(生产入库)"); dataTable.Rows.Add("SCTLSQ(生产退料申请)"); dataTable.Rows.Add("SCTL(生产退料)"); dataTable.Rows.Add("SCCLSQ(生产超领申请)"); dataTable.Rows.Add("SCCL(生产超领)"); dataTable.Rows.Add("SCBLSQ(生产补料申请)"); dataTable.Rows.Add("SCBL(生产补料)"); dataTable.Rows.Add("WWPC(委外排产)"); dataTable.Rows.Add("WWTLSQ(委外退料申请)"); dataTable.Rows.Add("WWTL(委外退料)"); dataTable.Rows.Add("WWCLSQ(委外超领申请)"); dataTable.Rows.Add("WWCL(委外超领)"); dataTable.Rows.Add("WWBLSQ(委外补料申请)"); dataTable.Rows.Add("WWBL(委外补料)"); dataTable.Rows.Add("XSCK(销售出库)"); dataTable.Rows.Add("XSTH(销售退货)"); txt_docCode.Properties.DataSource = dataTable; txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列 txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列 @@ -363,32 +391,30 @@ || txxtItem1.Enabled == false || txxtItem2.Enabled == false || txxtItem3.Enabled == false || txxtItem4.Enabled == false) || txxtItem4.Enabled == false || txxtItem5.Enabled == false) return; var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text; var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text + txxtItem5.Text; ; txt_docFormat.Text = text; if (txt_docFormat.Text == "") { lblPreview.Text = "请定义规则."; } else { var preview = txt_docFormat.Text; var length = int.Parse(txt_noLength.Value.ToString()); var docCode = ""; if (txt_isIncludeDoc.Checked) docCode = txt_docCode.EditValue.ToString(); preview = docCode + preview; preview = preview.Replace("<无>", ""); preview = preview.Replace("<年年年年>", "2024"); preview = preview.Replace("<年年>", "24"); preview = preview.Replace("<月月>", "06"); preview = preview.Replace("<日日>", "18"); preview = preview + (txt_isSpilit.Checked ? "-" : "") + "8".PadLeft(length, '0'); lblPreview.Text = "样例：" + preview; } //if (txt_docFormat.Text == "") //{ // lblPreview.Text = "请定义规则."; //} //else //{ // var preview = txt_docFormat.Text; // var length = int.Parse(txt_noLength.Value.ToString()); // var docCode = ""; // if (txt_isIncludeDoc.Checked) // docCode = (txt_docCode.EditValue==null?"": txt_docCode.EditValue.ToString()); // preview = docCode + preview; // preview = preview.Replace("无", ""); // preview = preview.Replace("年年年年", "2025"); // preview = preview.Replace("年年", "25"); // preview = preview.Replace("月月", "06"); // preview = preview.Replace("日日", "18"); // preview = preview + (txt_isSpilit.Checked ? "-" : "") + "8".PadLeft(length, '0'); //} } /// <summary> @@ -438,7 +464,7 @@ } int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "checkStatus", "", "", picCheckBox, this, _inFieldValue.ToString()); UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -292,7 +292,5 @@ frm.ShowDialog(); } } } } DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -169,8 +169,15 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); } } /// <summary> /// 新增事件 /// </summary> DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -167,8 +167,16 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); } } /// <summary> /// 新增事件 /// </summary> DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Configuration; using System.Data; using System.Drawing; using System.Net; using System.Windows.Forms;
@@ -145,14 +145,15 @@ getModel(lbGuid.Text.Trim()); else { _filterList.Clear(); if (gridView1.ActiveFilter.Count > 0) { gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; } getPageList(1); //_filterList.Clear(); //if (gridView1.ActiveFilter.Count > 0) //{ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; // gridView1.ActiveFilter.Clear(); // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; //} //getPageList(1); getPageList(this.pageBar1.CurrentPage); } } @@ -163,16 +164,22 @@ /// <param name="e"></param> private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1); string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); } } /// <summary> @@ -242,8 +249,7 @@ private void getPageList(int curPage) { var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ", "desc", "", _sbSqlWhere.ToString()); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ", "desc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try { DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -215,7 +215,7 @@ // this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.userName.AppearanceCell.Options.UseFont = true; this.userName.Caption = "账号名称"; this.userName.Caption = "登录名称"; this.userName.FieldName = "userName"; this.userName.MinWidth = 50; this.userName.Name = "userName"; DevApp/Gs.DevApp/UserControl/UcLookUser.Designer.cs
@@ -33,6 +33,7 @@ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); this.SuspendLayout(); @@ -54,8 +55,9 @@ // searchLookUpEdit1View // this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn2, this.gridColumn5, this.gridColumn2, this.gridColumn1, this.gridColumn4}); this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; this.searchLookUpEdit1View.Name = "searchLookUpEdit1View"; @@ -64,28 +66,36 @@ // // gridColumn2 // this.gridColumn2.Caption = "用户名称"; this.gridColumn2.Caption = "登录名称"; this.gridColumn2.FieldName = "userName"; this.gridColumn2.MinWidth = 80; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.UnboundDataType = typeof(string); this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 0; this.gridColumn2.VisibleIndex = 1; this.gridColumn2.Width = 80; // // gridColumn5 // this.gridColumn5.Caption = "用户账号"; this.gridColumn5.Caption = "登录账号"; this.gridColumn5.FieldName = "account"; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 1; this.gridColumn5.VisibleIndex = 0; // // gridColumn4 // this.gridColumn4.Caption = "guid"; this.gridColumn4.FieldName = "guid"; this.gridColumn4.Name = "gridColumn4"; // // gridColumn1 // this.gridColumn1.Caption = "关联员工"; this.gridColumn1.FieldName = "staffId"; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 2; // // UcLookUser // @@ -107,5 +117,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } }
