| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -118,7 +118,7 @@ this.txtSupplierId = new DevExpress.XtraEditors.TextEdit(); this.txt_fType = new DevExpress.XtraEditors.CheckEdit(); this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit(); this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit(); this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit(); this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk(); this.labelControl3 = new DevExpress.XtraEditors.LabelControl(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); @@ -148,7 +148,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); this.SuspendLayout(); // @@ -753,6 +753,7 @@ this.gridColumn2.Caption = "入库"; this.gridColumn2.FieldName = "status"; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.Width = 50; // @@ -878,6 +879,7 @@ this.gridColumn4.Caption = "收货仓库名称"; this.gridColumn4.FieldName = "depotName"; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Visible = true; this.gridColumn4.Width = 119; // @@ -928,6 +930,7 @@ this.gridColumn5.Caption = "供应商名称"; this.gridColumn5.FieldName = "suppName"; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.Visible = true; this.gridColumn5.Width = 49; // @@ -1069,7 +1072,7 @@ this.panel1.Controls.Add(this.txtSupplierId); this.panel1.Controls.Add(this.txt_fType); this.panel1.Controls.Add(this.txt_urgentFlag); this.panel1.Controls.Add(this.txt_ischeck); this.panel1.Controls.Add(this.txt_fstatus); this.panel1.Controls.Add(this.txt_depotsId); this.panel1.Controls.Add(this.labelControl3); this.panel1.Controls.Add(this.btnSelect); @@ -1157,14 +1160,14 @@ this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24); this.txt_urgentFlag.TabIndex = 449; // // txt_ischeck // txt_fstatus // this.txt_ischeck.Enabled = false; this.txt_ischeck.Location = new System.Drawing.Point(785, 92); this.txt_ischeck.Name = "txt_ischeck"; this.txt_ischeck.Properties.Caption = ""; this.txt_ischeck.Size = new System.Drawing.Size(47, 24); this.txt_ischeck.TabIndex = 447; this.txt_fstatus.Enabled = false; this.txt_fstatus.Location = new System.Drawing.Point(785, 92); this.txt_fstatus.Name = "txt_fstatus"; this.txt_fstatus.Properties.Caption = ""; this.txt_fstatus.Size = new System.Drawing.Size(47, 24); this.txt_fstatus.TabIndex = 447; // // txt_depotsId // @@ -1280,7 +1283,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); this.ResumeLayout(false); @@ -1337,7 +1340,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid; private DevExpress.XtraEditors.LabelControl lb_remark; private DevExpress.XtraEditors.TextEdit txt_remark; private DevExpress.XtraEditors.CheckEdit txt_ischeck; private DevExpress.XtraEditors.CheckEdit txt_fstatus; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -6,7 +6,6 @@ using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Base.ViewInfo; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -107,14 +106,13 @@ frm.ShowDialog(); }; //验退 btnTui.Click += (s, e) => btnTui.Click += async (s, e) => { if (string.IsNullOrEmpty(lbGuid.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("暂未保存，不能退货！"); return; } var lst = new List<string>(); for (var i = 0; i < gvMx1.DataRowCount; i++) { @@ -127,23 +125,25 @@ Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你需要退的物料！"); return; } UcLoading _loading = new UcLoading(); var _obj = lst; try { var strJson = UtilityHelper.HttpPost("", var strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "TuiMx", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { } MsgHelper.Warning("提示：" + _rtn.rtnMsg); MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } _loading.Stop(); }; } @@ -207,33 +207,95 @@ } /// <summary> /// 反检验 /// 反检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) private async void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？")) return; UcLoading _loading = new UcLoading(); var _obj = new { guid = rowGuid, }; try { var strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "EditModelSubmitF", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg); if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } _loading.Stop(); } /// <summary> /// 检验 /// 检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？")) return; UcLoading _loading = new UcLoading(); var _obj = new { guid = rowGuid, }; try { var strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg); if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } _loading.Stop(); } /// <summary> /// 取消事件 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -240,21 +240,21 @@ btnFjianYanClick(this, e); else return; if (string.IsNullOrEmpty(guidKey)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } //if (string.IsNullOrEmpty(guidKey)) //{ // MsgHelper.Warning("请先选择你要操作的行！"); // return; //} if (string.IsNullOrEmpty(chkParameter)) { MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！"); return; } //if (string.IsNullOrEmpty(chkParameter)) //{ // MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！"); // return; //} if (!MsgHelper.AskQuestion("你选择了1条数据，确定撤回检验吗？")) return; _ckService(0.ToString()); //if (!MsgHelper.AskQuestion("你选择了1条数据，确定撤回检验吗？")) // return; //_ckService(0.ToString()); } private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e) @@ -264,26 +264,26 @@ else return; if (string.IsNullOrEmpty(guidKey)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } //if (string.IsNullOrEmpty(guidKey)) //{ // MsgHelper.Warning("请先选择你要操作的行！"); // return; //} if (string.IsNullOrEmpty(chkParameter)) { MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！"); return; } //if (string.IsNullOrEmpty(chkParameter)) //{ // MsgHelper.ShowError("没有指定检验参数，请联系开发人员获取支持！"); // return; //} if (!MsgHelper.AskQuestion("你选择了1条数据，确定提交检验吗？")) return; var _obj = new { guid = guidKey, parameter = chkParameter }; _ckService(1.ToString()); //if (!MsgHelper.AskQuestion("你选择了1条数据，确定提交检验吗？")) // return; //var _obj = new //{ // guid = guidKey, // parameter = chkParameter //}; //_ckService(1.ToString()); } private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
