lu
2025-01-05 1c7670d281e3e287e480b4a27dd6667fb17b8c9d
细节
已修改7个文件
512 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs 295 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -691,13 +691,13 @@
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.Caption = "最后修改时间 ";
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
            this.gv_lastUpdateTime.MinWidth = 50;
            this.gv_lastUpdateTime.MinWidth = 180;
            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.VisibleIndex = 6;
            this.gv_lastUpdateTime.Width = 94;
            this.gv_lastUpdateTime.Width = 180;
            // 
            // gv_lastUpdateUser
            // 
@@ -739,13 +739,13 @@
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "单据编码";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.MinWidth = 120;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 4;
            this.gv_billNo.Width = 94;
            this.gv_billNo.Width = 120;
            // 
            // toolBarMenu1
            // 
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -29,11 +29,6 @@
        /// </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();
            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,14 +48,8 @@
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fmrmode = new DevExpress.XtraEditors.LabelControl();
            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_nflag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fType = new DevExpress.XtraEditors.LabelControl();
@@ -71,14 +60,12 @@
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_reason = new DevExpress.XtraEditors.LabelControl();
            this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -86,6 +73,7 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -110,13 +98,12 @@
            this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panel1 = new System.Windows.Forms.Panel();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
            this.txt_check = new DevExpress.XtraEditors.CheckEdit();
            this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
            this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkUserFname = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -124,7 +111,6 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -140,6 +126,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
@@ -307,7 +295,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 341);
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
            this.tabMxPage2.Text = "退货物料申请";
            // 
            // gcMx2
@@ -316,9 +304,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx2.Size = new System.Drawing.Size(1124, 341);
            this.gcMx2.Size = new System.Drawing.Size(1124, 388);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -341,8 +327,7 @@
            this.gvMx2remark,
            this.gvMx2ebelnK3id,
            this.gvMx2lineK3id,
            this.gvMx2itemOutId,
            this.gvMxDel});
            this.gvMx2itemOutId});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -400,68 +385,11 @@
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.Width = 94;
            // 
            // gvMxDel
            //
            this.gvMxDel.Caption = "移出";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 13;
            this.gvMxDel.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // gv_depotId
            //
            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "depot_id ";
            this.gv_depotId.FieldName = "depotId";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.depot_id";
            this.gv_depotId.Width = 94;
            //
            // gv_suppId
            //
            this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppId.AppearanceCell.Options.UseFont = true;
            this.gv_suppId.Caption = "supp_id ";
            this.gv_suppId.FieldName = "suppId";
            this.gv_suppId.MinWidth = 50;
            this.gv_suppId.Name = "gv_suppId";
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.supp_id";
            this.gv_suppId.Width = 94;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "GUID ";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.GUID";
            this.gv_guid.Width = 94;
            //
            // lb_fmrmode
            // 
            this.lb_fmrmode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fmrmode.Appearance.Options.UseFont = true;
            this.lb_fmrmode.Location = new System.Drawing.Point(336, 55);
            this.lb_fmrmode.Location = new System.Drawing.Point(336, 51);
            this.lb_fmrmode.Name = "lb_fmrmode";
            this.lb_fmrmode.Size = new System.Drawing.Size(73, 21);
            this.lb_fmrmode.TabIndex = 507;
@@ -478,28 +406,14 @@
            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
            this.gv_fmrmode.Tag = "query_a.fmrmode";
            this.gv_fmrmode.Visible = true;
            this.gv_fmrmode.VisibleIndex = 16;
            this.gv_fmrmode.VisibleIndex = 14;
            this.gv_fmrmode.Width = 94;
            //
            // gv_nflag
            //
            this.gv_nflag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_nflag.AppearanceCell.Options.UseFont = true;
            this.gv_nflag.Caption = "推送标识";
            this.gv_nflag.FieldName = "nflag";
            this.gv_nflag.MinWidth = 50;
            this.gv_nflag.Name = "gv_nflag";
            this.gv_nflag.OptionsColumn.AllowEdit = false;
            this.gv_nflag.Tag = "query_a.nflag";
            this.gv_nflag.Visible = true;
            this.gv_nflag.VisibleIndex = 1;
            this.gv_nflag.Width = 94;
            // 
            // lb_suppNo
            // 
            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppNo.Appearance.Options.UseFont = true;
            this.lb_suppNo.Location = new System.Drawing.Point(39, 55);
            this.lb_suppNo.Location = new System.Drawing.Point(39, 51);
            this.lb_suppNo.Name = "lb_suppNo";
            this.lb_suppNo.Size = new System.Drawing.Size(51, 21);
            this.lb_suppNo.TabIndex = 387;
@@ -534,20 +448,21 @@
            this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fType.AppearanceCell.Options.UseFont = true;
            this.gv_fType.Caption = "委外标识";
            this.gv_fType.FieldName = "fType";
            this.gv_fType.FieldName = "isOut";
            this.gv_fType.MaxWidth = 50;
            this.gv_fType.MinWidth = 50;
            this.gv_fType.Name = "gv_fType";
            this.gv_fType.OptionsColumn.AllowEdit = false;
            this.gv_fType.Tag = "query_a.f_type";
            this.gv_fType.Visible = true;
            this.gv_fType.VisibleIndex = 2;
            this.gv_fType.Width = 94;
            this.gv_fType.Width = 50;
            // 
            // lb_depotCode
            // 
            this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depotCode.Appearance.Options.UseFont = true;
            this.lb_depotCode.Location = new System.Drawing.Point(22, 93);
            this.lb_depotCode.Location = new System.Drawing.Point(22, 84);
            this.lb_depotCode.Name = "lb_depotCode";
            this.lb_depotCode.Size = new System.Drawing.Size(68, 21);
            this.lb_depotCode.TabIndex = 267;
@@ -571,7 +486,7 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(552, 93);
            this.lb_checkDate.Location = new System.Drawing.Point(552, 84);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
            this.lb_checkDate.TabIndex = 252;
@@ -580,7 +495,7 @@
            // txt_checkDate
            // 
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(627, 89);
            this.txt_checkDate.Location = new System.Drawing.Point(627, 80);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -593,13 +508,13 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "审核日期 ";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 50;
            this.gv_checkDate.MinWidth = 180;
            this.gv_checkDate.Name = "gv_checkDate";
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 13;
            this.gv_checkDate.Width = 94;
            this.gv_checkDate.VisibleIndex = 12;
            this.gv_checkDate.Width = 180;
            // 
            // lb_checkUser
            // 
@@ -611,25 +526,11 @@
            this.lb_checkUser.TabIndex = 247;
            this.lb_checkUser.Text = "审核";
            // 
            // gv_checkUser
            //
            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人编码";
            this.gv_checkUser.FieldName = "checkUser";
            this.gv_checkUser.MinWidth = 50;
            this.gv_checkUser.Name = "gv_checkUser";
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.check_user";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 14;
            this.gv_checkUser.Width = 94;
            //
            // lb_reason
            // 
            this.lb_reason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_reason.Appearance.Options.UseFont = true;
            this.lb_reason.Location = new System.Drawing.Point(336, 93);
            this.lb_reason.Location = new System.Drawing.Point(336, 84);
            this.lb_reason.Name = "lb_reason";
            this.lb_reason.Size = new System.Drawing.Size(73, 21);
            this.lb_reason.TabIndex = 240;
@@ -646,14 +547,14 @@
            this.gv_reason.OptionsColumn.AllowEdit = false;
            this.gv_reason.Tag = "query_a.reason";
            this.gv_reason.Visible = true;
            this.gv_reason.VisibleIndex = 8;
            this.gv_reason.VisibleIndex = 13;
            this.gv_reason.Width = 94;
            // 
            // lb_remark
            // 
            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(22, 130);
            this.lb_remark.Location = new System.Drawing.Point(22, 118);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(68, 21);
            this.lb_remark.TabIndex = 235;
@@ -661,7 +562,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(94, 126);
            this.txt_remark.Location = new System.Drawing.Point(94, 114);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -679,7 +580,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 9;
            this.gv_remark.VisibleIndex = 8;
            this.gv_remark.Width = 94;
            // 
            // gv_createDate
@@ -688,27 +589,13 @@
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.MinWidth = 180;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 10;
            this.gv_createDate.Width = 94;
            //
            // gv_createBy
            //
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "创建人编码";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 11;
            this.gv_createBy.Width = 94;
            this.gv_createDate.Width = 180;
            // 
            // gv_status
            // 
@@ -722,7 +609,7 @@
            this.gv_status.OptionsColumn.AllowEdit = false;
            this.gv_status.Tag = "query_a.status";
            this.gv_status.Visible = true;
            this.gv_status.VisibleIndex = 0;
            this.gv_status.VisibleIndex = 1;
            this.gv_status.Width = 50;
            // 
            // lb_itemOutNo
@@ -751,13 +638,13 @@
            this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemOutNo.Caption = "出库单号 ";
            this.gv_itemOutNo.FieldName = "itemOutNo";
            this.gv_itemOutNo.MinWidth = 50;
            this.gv_itemOutNo.MinWidth = 100;
            this.gv_itemOutNo.Name = "gv_itemOutNo";
            this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
            this.gv_itemOutNo.Tag = "query_a.item_out_no";
            this.gv_itemOutNo.Visible = true;
            this.gv_itemOutNo.VisibleIndex = 3;
            this.gv_itemOutNo.Width = 94;
            this.gv_itemOutNo.Width = 100;
            // 
            // toolBarMenu1
            // 
@@ -794,26 +681,21 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn13,
            this.gv_status,
            this.gv_nflag,
            this.gv_fType,
            this.gv_itemOutNo,
            this.gv_suppNo,
            this.gridColumn1,
            this.gv_depotCode,
            this.gridColumn2,
            this.gv_reason,
            this.gv_remark,
            this.gv_createDate,
            this.gv_createBy,
            this.gridColumn3,
            this.gv_checkDate,
            this.gv_checkUser,
            this.gv_createDate,
            this.gridColumn4,
            this.gv_fmrmode,
            this.gv_guid,
            this.gv_suppId,
            this.gv_depotId});
            this.gv_checkDate,
            this.gv_reason,
            this.gv_fmrmode});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -821,11 +703,22 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn13
            //
            this.gridColumn13.Caption = "退料组织";
            this.gridColumn13.FieldName = "receivingOrg";
            this.gridColumn13.MinWidth = 250;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Tag = "org.fnamber";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 0;
            this.gridColumn13.Width = 250;
            //
            // gridColumn1
            // 
            this.gridColumn1.Caption = "供应商名称";
            this.gridColumn1.FieldName = "SuppName";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.FieldName = "suppName";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
@@ -835,7 +728,7 @@
            // 
            this.gridColumn2.Caption = "仓库名称";
            this.gridColumn2.FieldName = "depotName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
@@ -843,12 +736,12 @@
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "创建人姓名";
            this.gridColumn3.Caption = "创建人";
            this.gridColumn3.FieldName = "createByFname";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 12;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
@@ -858,7 +751,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 15;
            this.gridColumn4.VisibleIndex = 11;
            this.gridColumn4.Width = 94;
            // 
            // xtraTabControl1
@@ -904,10 +797,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 197);
            this.tabMx.Location = new System.Drawing.Point(0, 150);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1126, 373);
            this.tabMx.Size = new System.Drawing.Size(1126, 420);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage2,
@@ -917,7 +810,7 @@
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx1);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 341);
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 388);
            this.xtraTabPage3.Text = "退货物料扫码";
            // 
            // gcMx1
@@ -926,7 +819,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 341);
            this.gcMx1.Size = new System.Drawing.Size(1124, 388);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -949,7 +842,6 @@
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gvMx1guid
@@ -1087,13 +979,12 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.btnSelect);
            this.panel1.Controls.Add(this.txt_suppName);
            this.panel1.Controls.Add(this.txt_depotName);
            this.panel1.Controls.Add(this.txt_check);
            this.panel1.Controls.Add(this.txt_fType);
            this.panel1.Controls.Add(this.txt_fmrmode);
            this.panel1.Controls.Add(this.txt_reason);
            this.panel1.Controls.Add(this.txt_suppId);
            this.panel1.Controls.Add(this.txt_depotId);
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.txt_checkUserFname);
            this.panel1.Controls.Add(this.lbGuid);
@@ -1113,17 +1004,28 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 197);
            this.panel1.Size = new System.Drawing.Size(1126, 150);
            this.panel1.TabIndex = 1;
            // 
            // btnSelect
            // txt_suppName
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(22, 160);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(128, 29);
            this.btnSelect.TabIndex = 522;
            this.btnSelect.Text = "去选择来料明细";
            this.txt_suppName.Enabled = false;
            this.txt_suppName.Location = new System.Drawing.Point(94, 80);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(221, 28);
            this.txt_suppName.TabIndex = 524;
            //
            // txt_depotName
            //
            this.txt_depotName.Enabled = false;
            this.txt_depotName.Location = new System.Drawing.Point(94, 47);
            this.txt_depotName.Name = "txt_depotName";
            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
            this.txt_depotName.Size = new System.Drawing.Size(221, 28);
            this.txt_depotName.TabIndex = 523;
            // 
            // txt_check
            // 
@@ -1144,7 +1046,7 @@
            // 
            // txt_fmrmode
            // 
            this.txt_fmrmode.Location = new System.Drawing.Point(415, 53);
            this.txt_fmrmode.Location = new System.Drawing.Point(415, 49);
            this.txt_fmrmode.Name = "txt_fmrmode";
            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1156,7 +1058,7 @@
            // 
            // txt_reason
            // 
            this.txt_reason.Location = new System.Drawing.Point(415, 91);
            this.txt_reason.Location = new System.Drawing.Point(415, 82);
            this.txt_reason.Name = "txt_reason";
            this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1169,29 +1071,11 @@
            this.txt_reason.Size = new System.Drawing.Size(125, 24);
            this.txt_reason.TabIndex = 518;
            // 
            // txt_suppId
            //
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.Location = new System.Drawing.Point(94, 50);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(221, 28);
            this.txt_suppId.TabIndex = 517;
            //
            // txt_depotId
            //
            this.txt_depotId.IsReadly = true;
            this.txt_depotId.Location = new System.Drawing.Point(94, 88);
            this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Size = new System.Drawing.Size(221, 28);
            this.txt_depotId.TabIndex = 516;
            //
            // labelControl3
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(569, 55);
            this.labelControl3.Location = new System.Drawing.Point(569, 51);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(51, 21);
            this.labelControl3.TabIndex = 512;
@@ -1200,7 +1084,7 @@
            // txt_checkUserFname
            // 
            this.txt_checkUserFname.Enabled = false;
            this.txt_checkUserFname.Location = new System.Drawing.Point(627, 51);
            this.txt_checkUserFname.Location = new System.Drawing.Point(627, 47);
            this.txt_checkUserFname.Name = "txt_checkUserFname";
            this.txt_checkUserFname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUserFname.Properties.Appearance.Options.UseFont = true;
@@ -1239,7 +1123,6 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1256,6 +1139,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
@@ -1292,13 +1177,9 @@
 private DevExpress.XtraTab.XtraTabPage tabMxPage2;
 private DevExpress.XtraGrid.GridControl gcMx2;
 private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
 private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
 private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
 private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraEditors.LabelControl lb_fmrmode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_nflag;
private DevExpress.XtraEditors.LabelControl lb_suppNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
@@ -1314,7 +1195,6 @@
 private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraEditors.LabelControl lb_checkUser;
 private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraEditors.LabelControl lb_reason;
 private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
@@ -1323,7 +1203,6 @@
private DevExpress.XtraEditors.TextEdit txt_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_status;
private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
@@ -1352,17 +1231,15 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private UserControl.UcLookCk txt_depotId;
        private UserControl.UcLookSupplier txt_suppId;
        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
        private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
        private DevExpress.XtraEditors.CheckEdit txt_fType;
        private DevExpress.XtraEditors.CheckEdit txt_check;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private DevExpress.XtraEditors.TextEdit txt_depotName;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -1,15 +1,11 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -246,44 +242,7 @@
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx2.CloseEditor();
            gvMx2.UpdateCurrentRow();
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx2.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx2",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            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();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
            this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -93,8 +93,9 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -111,7 +112,6 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
@@ -698,10 +698,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -718,13 +718,13 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Enabled = false;
            this.txt_checkUser.Location = new System.Drawing.Point(600, 46);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 28);
            this.txt_checkUser.TabIndex = 273;
            this.txt_checkUser.Tag = "readonly";
            // 
            // gv_checkUser
            // 
@@ -752,13 +752,13 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(600, 14);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 28);
            this.txt_checkDate.TabIndex = 267;
            this.txt_checkDate.Tag = "readonly";
            // 
            // gv_checkDate
            // 
@@ -921,16 +921,16 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn2
            // gridColumn4
            // 
            this.gridColumn2.Caption = "排产单号";
            this.gridColumn2.FieldName = "hNo";
            this.gridColumn2.MinWidth = 150;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 150;
            this.gridColumn4.Caption = "生产组织";
            this.gridColumn4.FieldName = "fSubsidiary";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Tag = "org.fnamber";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 250;
            // 
            // gridColumn1
            // 
@@ -941,6 +941,17 @@
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "排产单号";
            this.gridColumn2.FieldName = "hNo";
            this.gridColumn2.MinWidth = 150;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 150;
            // 
            // xtraTabControl1
            // 
@@ -1048,13 +1059,13 @@
            // 
            // txt_hNo
            // 
            this.txt_hNo.Enabled = false;
            this.txt_hNo.Location = new System.Drawing.Point(360, 14);
            this.txt_hNo.Name = "txt_hNo";
            this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_hNo.Properties.Appearance.Options.UseFont = true;
            this.txt_hNo.Size = new System.Drawing.Size(150, 28);
            this.txt_hNo.TabIndex = 458;
            this.txt_hNo.Tag = "readonly";
            // 
            // labelControl1
            // 
@@ -1113,17 +1124,6 @@
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "生产组织";
            this.gridColumn4.FieldName = "fSubsidiary";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Tag = "org.fnamber";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 250;
            // 
            // Frm_Wompba
            // 
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -135,6 +135,8 @@
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -317,10 +319,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -360,7 +362,9 @@
            this.gridColumn10,
            this.gridColumn5,
            this.gridColumn9,
            this.gridColumn7});
            this.gridColumn7,
            this.gridColumn15,
            this.gridColumn19});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1335,6 +1339,26 @@
            this.txt_billNo.Size = new System.Drawing.Size(215, 28);
            this.txt_billNo.TabIndex = 211;
            // 
            // gridColumn15
            //
            this.gridColumn15.Caption = "检验状态";
            this.gridColumn15.FieldName = "checkStates";
            this.gridColumn15.MinWidth = 50;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 12;
            this.gridColumn15.Width = 94;
            //
            // gridColumn19
            //
            this.gridColumn19.Caption = "检验结果";
            this.gridColumn19.FieldName = "checkRes";
            this.gridColumn19.MinWidth = 50;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 13;
            this.gridColumn19.Width = 94;
            //
            // Frm_ArrivalBarcode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1490,5 +1514,7 @@
        private DevExpress.XtraEditors.TextEdit txt_dptName;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
    }
}
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -33,7 +33,6 @@
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -43,6 +42,7 @@
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
@@ -77,7 +77,6 @@
            this.gv_chk,
            this.gv_guid,
            this.gv_billNo,
            this.gridColumn1,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
            this.gridColumn5,
@@ -86,7 +85,8 @@
            this.gridColumn9,
            this.gv_purchaseUnit,
            this.gridColumn10,
            this.gridColumn2});
            this.gridColumn2,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -132,17 +132,6 @@
            this.gv_billNo.VisibleIndex = 1;
            this.gv_billNo.Width = 110;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "物料ID";
            this.gridColumn1.FieldName = "itemId";
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 94;
            //
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -155,7 +144,7 @@
            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 3;
            this.gv_supplierItemCode.VisibleIndex = 2;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
@@ -170,7 +159,7 @@
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 5;
            this.gv_supplierItemName.VisibleIndex = 3;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
@@ -181,7 +170,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 7;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn6
@@ -192,7 +181,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 100;
            // 
            // gridColumn7
@@ -208,13 +197,17 @@
            // 
            // gridColumn9
            // 
            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn9.Caption = "已退数量";
            this.gridColumn9.FieldName = "yt";
            this.gridColumn9.MinWidth = 100;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 8;
            this.gridColumn9.VisibleIndex = 7;
            this.gridColumn9.Width = 100;
            // 
            // gv_purchaseUnit
@@ -228,8 +221,6 @@
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Visible = true;
            this.gv_purchaseUnit.VisibleIndex = 9;
            this.gv_purchaseUnit.Width = 100;
            // 
            // gridColumn10
@@ -239,19 +230,28 @@
            this.gridColumn10.MinWidth = 125;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 10;
            this.gridColumn10.VisibleIndex = 9;
            this.gridColumn10.Width = 125;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "收料组织";
            this.gridColumn2.FieldName = "fSubsidiary";
            this.gridColumn2.FieldName = "receivingOrg";
            this.gridColumn2.MinWidth = 250;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 11;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 250;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "物料ID";
            this.gridColumn1.FieldName = "itemId";
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            //
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs
@@ -79,8 +79,6 @@
            this.gridColumn1.Caption = "车间ID";
            this.gridColumn1.FieldName = "departmentid";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            // 
            // gridColumn2
            // 
@@ -90,7 +88,7 @@
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.UnboundDataType = typeof(string);
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            // 
            // gridColumn3
@@ -100,7 +98,7 @@
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn4