| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.gvMx1orderNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1isFinish = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -405,10 +405,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -946,28 +946,34 @@ // // txt_returnType // this.txt_returnType.EditValue = "-请选择-"; this.txt_returnType.Location = new System.Drawing.Point(435, 85); this.txt_returnType.Name = "txt_returnType"; this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_returnType.Properties.Items.AddRange(new object[] { "-请选择-", "来料不良", "供应商多送", "作业不良", "供应商物品号错误", "采购料号变更"}); this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_returnType.Size = new System.Drawing.Size(150, 24); this.txt_returnType.TabIndex = 521; // // txt_returnMethod // this.txt_returnMethod.EditValue = "-请选择-"; this.txt_returnMethod.Location = new System.Drawing.Point(435, 52); this.txt_returnMethod.Name = "txt_returnMethod"; this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_returnMethod.Properties.Items.AddRange(new object[] { "-请选择-", "退料补料", "退料并扣款"}); this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_returnMethod.Size = new System.Drawing.Size(150, 24); this.txt_returnMethod.TabIndex = 520; // DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -15,6 +15,8 @@ { string _webServiceName = "MesCgthSqManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); string _ucCk = "";//发料仓库 string _ucGys = "";//供应商 public Frm_MesCgthSq() { InitializeComponent(); @@ -43,13 +45,14 @@ pageBar1.PagerEvent += PageBar1_PagerEvent; txt_depotId.getSuppler(""); txt_suppId.getSuppler(""); //选择库存组织（仓库和供应商） txt_thOrgId.EditChanged += (s, e) => { var orgId = txt_thOrgId.GetId(); if (string.IsNullOrEmpty(orgId)) return; txt_suppId.getSuppler(orgId); txt_depotId.getSuppler(orgId); txt_suppId.getSuppler(orgId, _ucGys); txt_depotId.getSuppler(orgId, _ucCk); }; //选择需要的明细 btnSelect.Click += (s, e) => @@ -300,13 +303,13 @@ txt_depotId.Focus(); return; } if (string.IsNullOrEmpty(txt_returnMethod.Text.Trim())) if (txt_returnMethod.SelectedIndex <= 0) { MsgHelper.Warning("请选择退料方式！"); txt_returnMethod.Focus(); return; } if (string.IsNullOrEmpty(txt_returnType.Text.Trim())) if (txt_returnType.SelectedIndex <= 0) { MsgHelper.Warning("请选择退料原因！"); txt_returnType.Focus(); @@ -363,7 +366,10 @@ lbGuid.Text = _rtn.rtnData.outGuid; txt_billNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(panel1.Controls, false); List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList); toolBarMenu1.currentAction = ""; } } catch (Exception ex) @@ -435,10 +441,14 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; _ucGys = dy.suppId; _ucCk = dy.depotId; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList); _ucGys = ""; _ucCk = ""; JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -64,8 +64,7 @@ var json = JsonConvert.SerializeObject(_obj); try { var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json); var strReturn = UtilityHelper.HttpPost("","MesItemsManager/GetListSelect", json); var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -41,6 +41,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1); Form parentForm = this.FindForm(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName,gridView1,picCheckBox, parentForm, "bl018", "", (value) => @@ -109,6 +110,16 @@ Task.Delay(100); getPageList(1); } private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e) { Form parentForm = this.FindForm(); string _formNamespace= parentForm.GetType().FullName; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gridView1); Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList); DevFrm.ShowDialog(); } /// <summary> /// 日志 /// </summary> DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -33,6 +33,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick; Form parentForm = this.FindForm(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName,gvMx2); @@ -57,7 +58,15 @@ Task.Delay(100); getPageList(1); } private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e) { Form parentForm = this.FindForm(); string _formNamespace = parentForm.GetType().FullName; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gridView1); Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList); DevFrm.ShowDialog(); } /// <summary> /// 日志 /// </summary> DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -33,6 +33,11 @@ if (EditChanged != null) EditChanged(this, e); } /// <summary> /// 读供应商 /// </summary> /// <param name="orgId"></param> /// <param name="_dftVale"></param> public void getSuppler(string orgId, string _dftVale = "") { lookSearchSupplier.EditValue = null;
