lu
2025-02-08 ecb9a7902dbe166ff684980fd58ac46f704a614c
采购模块的各种细节
已修改6个文件
238 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -59,7 +59,7 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商!");
                    return;
                }
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(),this.txt_suppId.GetId(), (txt_isOut.Checked == true ? 2 : 1).ToString());
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(),this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -47,7 +47,6 @@
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fmrmode = new DevExpress.XtraEditors.LabelControl();
            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
@@ -100,12 +99,12 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
            this.txt_check = new DevExpress.XtraEditors.CheckEdit();
            this.txt_status = 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.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkUserFname = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tabMxPage2.SuspendLayout();
@@ -128,11 +127,11 @@
            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_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -142,7 +141,6 @@
            this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemOutId.Caption = "出库ID ";
            this.gvMx2itemOutId.FieldName = "itemOutId";
            this.gvMx2itemOutId.MinWidth = 50;
            this.gvMx2itemOutId.Name = "gvMx2itemOutId";
            this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
            this.gvMx2itemOutId.Tag = "query_a.item_out_id";
@@ -154,7 +152,6 @@
            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
            this.gvMx2tlQty.Caption = "已扫数量 ";
            this.gvMx2tlQty.FieldName = "tlQty";
            this.gvMx2tlQty.MinWidth = 50;
            this.gvMx2tlQty.Name = "gvMx2tlQty";
            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
            this.gvMx2tlQty.Tag = "query_a.tl_qty";
@@ -168,7 +165,6 @@
            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2pbillNo.Caption = "到货单号";
            this.gvMx2pbillNo.FieldName = "pbillNo";
            this.gvMx2pbillNo.MinWidth = 50;
            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
@@ -180,15 +176,16 @@
            // 
            this.gvMx2status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx2status.AppearanceCell.Options.UseFont = true;
            this.gvMx2status.Caption = "完结标识";
            this.gvMx2status.Caption = "完结";
            this.gvMx2status.FieldName = "status";
            this.gvMx2status.MaxWidth = 50;
            this.gvMx2status.MinWidth = 50;
            this.gvMx2status.Name = "gvMx2status";
            this.gvMx2status.OptionsColumn.ReadOnly = true;
            this.gvMx2status.Tag = "query_a.status";
            this.gvMx2status.Visible = true;
            this.gvMx2status.VisibleIndex = 0;
            this.gvMx2status.Width = 94;
            this.gvMx2status.Width = 50;
            // 
            // gvMx2lineK3id
            // 
@@ -196,7 +193,6 @@
            this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2lineK3id.Caption = "采购单行ID ";
            this.gvMx2lineK3id.FieldName = "lineK3id";
            this.gvMx2lineK3id.MinWidth = 50;
            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
@@ -210,7 +206,6 @@
            this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2ebelnK3id.Caption = "采购单ID ";
            this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
            this.gvMx2ebelnK3id.MinWidth = 50;
            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
@@ -224,7 +219,6 @@
            this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
            this.gvMx2workLine.Caption = "行号 ";
            this.gvMx2workLine.FieldName = "workLine";
            this.gvMx2workLine.MinWidth = 50;
            this.gvMx2workLine.Name = "gvMx2workLine";
            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
            this.gvMx2workLine.Tag = "query_a.work_line";
@@ -238,7 +232,6 @@
            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
            this.gvMx2depotCode.Caption = "仓库编码";
            this.gvMx2depotCode.FieldName = "depotCode";
            this.gvMx2depotCode.MinWidth = 50;
            this.gvMx2depotCode.Name = "gvMx2depotCode";
            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
            this.gvMx2depotCode.Tag = "query_a.depot_code";
@@ -252,7 +245,6 @@
            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
            this.gvMx2remark.Caption = "备注信息 ";
            this.gvMx2remark.FieldName = "remark";
            this.gvMx2remark.MinWidth = 50;
            this.gvMx2remark.Name = "gvMx2remark";
            this.gvMx2remark.OptionsColumn.ReadOnly = true;
            this.gvMx2remark.Tag = "query_a.remark";
@@ -270,7 +262,6 @@
            this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx2quantity.Caption = "申请数量 ";
            this.gvMx2quantity.FieldName = "quantity";
            this.gvMx2quantity.MinWidth = 50;
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.quantity";
            this.gvMx2quantity.Visible = true;
@@ -283,7 +274,6 @@
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.MinWidth = 50;
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
@@ -296,7 +286,7 @@
            this.tabMxPage2.Controls.Add(this.gcMx1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
            this.tabMxPage2.Text = "退货物料申请";
            this.tabMxPage2.Text = "退货物料明细";
            // 
            // gcMx1
            // 
@@ -320,7 +310,6 @@
            this.gvMx2itemNo,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gvMx2quantity,
            this.gvMx2tlQty,
            this.gvMx2depotCode,
@@ -356,7 +345,6 @@
            // 
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
@@ -367,23 +355,11 @@
            // 
            this.gridColumn6.Caption = "规格型号";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "剩余可退数";
            this.gridColumn7.FieldName = "ktQty";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.Width = 94;
            // 
            // lb_fmrmode
            // 
@@ -401,7 +377,6 @@
            this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
            this.gv_fmrmode.Caption = "退料方式 ";
            this.gv_fmrmode.FieldName = "fmrmode";
            this.gv_fmrmode.MinWidth = 50;
            this.gv_fmrmode.Name = "gv_fmrmode";
            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
            this.gv_fmrmode.Tag = "query_a.fmrmode";
@@ -424,8 +399,7 @@
            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
            this.gv_suppNo.Caption = "供应商编号 ";
            this.gv_suppNo.FieldName = "suppNo";
            this.gv_suppNo.MinWidth = 50;
            this.gv_suppNo.FieldName = "suppNo2";
            this.gv_suppNo.Name = "gv_suppNo";
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.supp_no";
@@ -474,7 +448,6 @@
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "退料仓库";
            this.gv_depotCode.FieldName = "depotCode";
            this.gv_depotCode.MinWidth = 50;
            this.gv_depotCode.Name = "gv_depotCode";
            this.gv_depotCode.OptionsColumn.AllowEdit = false;
            this.gv_depotCode.Tag = "query_a.depot_code";
@@ -486,7 +459,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, 84);
            this.lb_checkDate.Location = new System.Drawing.Point(548, 84);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
            this.lb_checkDate.TabIndex = 252;
@@ -494,12 +467,11 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(627, 80);
            this.txt_checkDate.Location = new System.Drawing.Point(623, 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;
            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
            this.txt_checkDate.Size = new System.Drawing.Size(158, 28);
            this.txt_checkDate.TabIndex = 252;
            // 
            // gv_checkDate
@@ -508,7 +480,6 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "审核日期 ";
            this.gv_checkDate.FieldName = "checkDate";
            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";
@@ -520,7 +491,7 @@
            // 
            this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkUser.Appearance.Options.UseFont = true;
            this.lb_checkUser.Location = new System.Drawing.Point(586, 19);
            this.lb_checkUser.Location = new System.Drawing.Point(582, 19);
            this.lb_checkUser.Name = "lb_checkUser";
            this.lb_checkUser.Size = new System.Drawing.Size(34, 21);
            this.lb_checkUser.TabIndex = 247;
@@ -542,7 +513,6 @@
            this.gv_reason.AppearanceCell.Options.UseFont = true;
            this.gv_reason.Caption = "退料原因";
            this.gv_reason.FieldName = "reason";
            this.gv_reason.MinWidth = 50;
            this.gv_reason.Name = "gv_reason";
            this.gv_reason.OptionsColumn.AllowEdit = false;
            this.gv_reason.Tag = "query_a.reason";
@@ -575,7 +545,6 @@
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注信息 ";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
@@ -589,7 +558,6 @@
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.FieldName = "createDate";
            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";
@@ -624,12 +592,11 @@
            // 
            // txt_itemOutNo
            // 
            this.txt_itemOutNo.Enabled = false;
            this.txt_itemOutNo.Location = new System.Drawing.Point(94, 15);
            this.txt_itemOutNo.Name = "txt_itemOutNo";
            this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemOutNo.Size = new System.Drawing.Size(221, 28);
            this.txt_itemOutNo.Size = new System.Drawing.Size(239, 28);
            this.txt_itemOutNo.TabIndex = 210;
            // 
            // gv_itemOutNo
@@ -638,7 +605,6 @@
            this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemOutNo.Caption = "出库单号 ";
            this.gv_itemOutNo.FieldName = "itemOutNo";
            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";
@@ -707,7 +673,6 @@
            // 
            this.gridColumn13.Caption = "退料组织";
            this.gridColumn13.FieldName = "receivingOrg";
            this.gridColumn13.MinWidth = 250;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Tag = "org.fnamber";
            this.gridColumn13.Visible = true;
@@ -718,7 +683,6 @@
            // 
            this.gridColumn1.Caption = "供应商名称";
            this.gridColumn1.FieldName = "suppName";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
@@ -728,7 +692,6 @@
            // 
            this.gridColumn2.Caption = "仓库名称";
            this.gridColumn2.FieldName = "depotName";
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
@@ -737,8 +700,7 @@
            // gridColumn3
            // 
            this.gridColumn3.Caption = "创建人";
            this.gridColumn3.FieldName = "createByFname";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.FieldName = "createBy";
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 9;
@@ -747,8 +709,7 @@
            // gridColumn4
            // 
            this.gridColumn4.Caption = "审核人";
            this.gridColumn4.FieldName = "checkUserFname";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.FieldName = "checkUser";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 11;
@@ -811,7 +772,7 @@
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 388);
            this.xtraTabPage3.Text = "退货物料扫码";
            this.xtraTabPage3.Text = "退货物料扫码明细";
            // 
            // gcMx2
            // 
@@ -861,7 +822,6 @@
            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemBarcode.Caption = "物料条码 ";
            this.gvMx1itemBarcode.FieldName = "itemBarcode";
            this.gvMx1itemBarcode.MinWidth = 50;
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
@@ -874,7 +834,6 @@
            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemNo.Caption = "物料编码";
            this.gvMx1itemNo.FieldName = "itemNo";
            this.gvMx1itemNo.MinWidth = 50;
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx1itemNo.Visible = true;
@@ -885,7 +844,6 @@
            // 
            this.gridColumn8.Caption = "物料名称";
            this.gridColumn8.FieldName = "itemName";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 2;
@@ -895,7 +853,6 @@
            // 
            this.gridColumn9.Caption = "规格型号";
            this.gridColumn9.FieldName = "itemModel";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 3;
@@ -917,8 +874,8 @@
            // gridColumn10
            // 
            this.gridColumn10.Caption = "单位";
            this.gridColumn10.FieldName = "fnumber";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.FieldName = "kcUnit";
            this.gridColumn10.MinWidth = 50;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 5;
@@ -930,7 +887,6 @@
            this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
            this.gvMx1depotCode.Caption = "仓库编码 ";
            this.gvMx1depotCode.FieldName = "depotCode";
            this.gvMx1depotCode.MinWidth = 50;
            this.gvMx1depotCode.Name = "gvMx1depotCode";
            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx1depotCode.Visible = true;
@@ -943,7 +899,6 @@
            this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
            this.gvMx1depotSectionCode.Caption = "货位编码 ";
            this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
            this.gvMx1depotSectionCode.MinWidth = 50;
            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
            this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
            this.gvMx1depotSectionCode.Visible = true;
@@ -956,7 +911,6 @@
            this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnK3id.Caption = "采购订单ID ";
            this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
            this.gvMx1ebelnK3id.MinWidth = 50;
            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx1ebelnK3id.Visible = true;
@@ -969,7 +923,6 @@
            this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx1lineK3id.Caption = "采购订单行ID ";
            this.gvMx1lineK3id.FieldName = "lineK3id";
            this.gvMx1lineK3id.MinWidth = 50;
            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
            this.gvMx1lineK3id.Visible = true;
@@ -981,12 +934,12 @@
            this.panel1.BackColor = System.Drawing.Color.White;
            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_status);
            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.labelControl3);
            this.panel1.Controls.Add(this.txt_checkUserFname);
            this.panel1.Controls.Add(this.txt_checkUser);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_fmrmode);
            this.panel1.Controls.Add(this.lb_suppNo);
@@ -1009,32 +962,30 @@
            // 
            // txt_suppName
            // 
            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.Size = new System.Drawing.Size(239, 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.Size = new System.Drawing.Size(239, 28);
            this.txt_depotName.TabIndex = 523;
            // 
            // txt_check
            // txt_status
            // 
            this.txt_check.Enabled = false;
            this.txt_check.Location = new System.Drawing.Point(627, 17);
            this.txt_check.Name = "txt_check";
            this.txt_check.Properties.Caption = "";
            this.txt_check.Size = new System.Drawing.Size(94, 24);
            this.txt_check.TabIndex = 521;
            this.txt_status.Enabled = false;
            this.txt_status.Location = new System.Drawing.Point(623, 17);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(94, 24);
            this.txt_status.TabIndex = 521;
            // 
            // txt_fType
            // 
@@ -1075,21 +1026,20 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(569, 51);
            this.labelControl3.Location = new System.Drawing.Point(565, 51);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(51, 21);
            this.labelControl3.TabIndex = 512;
            this.labelControl3.Text = "审核人";
            // 
            // txt_checkUserFname
            // txt_checkUser
            // 
            this.txt_checkUserFname.Enabled = false;
            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;
            this.txt_checkUserFname.Size = new System.Drawing.Size(150, 28);
            this.txt_checkUserFname.TabIndex = 513;
            this.txt_checkUser.Location = new System.Drawing.Point(623, 47);
            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(158, 28);
            this.txt_checkUser.TabIndex = 513;
            // 
            // lbGuid
            // 
@@ -1119,7 +1069,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesCgthSqDj";
            this.Text = "采购退货申请";
            this.Text = "采购退货单";
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1141,11 +1091,11 @@
            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_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1213,10 +1163,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_checkUserFname;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1234,7 +1183,7 @@
        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.XtraEditors.CheckEdit txt_status;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private System.Windows.Forms.PictureBox picCheckBox;
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -24,6 +24,8 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -160,7 +162,6 @@
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
@@ -168,6 +169,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -222,13 +224,14 @@
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt;
                        gcMx2.ForceInitialize();
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    //这是扫码表
                    JArray array1 = new JArray();
@@ -239,13 +242,14 @@
                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                    if (dt1.Rows.Count > 0)
                    {
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt1;
                        gcMx1.ForceInitialize();
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt1;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                }
                else
@@ -283,7 +287,6 @@
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
                return;
            var _obj = new
            {
                guid = rowGuid,
@@ -296,12 +299,15 @@
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -214,14 +214,14 @@
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    JArray array2 = new JArray();
@@ -232,14 +232,14 @@
                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt2;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                }
                else
@@ -249,7 +249,6 @@
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -49,6 +49,7 @@
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -81,6 +82,7 @@
            this.gv_guid,
            this.gv_chk,
            this.gridColumn3,
            this.gridColumn4,
            this.gv_billNo,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
@@ -142,13 +144,12 @@
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "采购单号";
            this.gv_billNo.FieldName = "ebeln";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 110;
            // 
            // gv_supplierItemCode
@@ -157,13 +158,12 @@
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "wlbm";
            this.gv_supplierItemCode.MinWidth = 50;
            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
            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 = 4;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
@@ -172,24 +172,22 @@
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "wlmc";
            this.gv_supplierItemName.MinWidth = 50;
            this.gv_supplierItemName.Name = "gv_supplierItemName";
            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 4;
            this.gv_supplierItemName.VisibleIndex = 5;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料规格";
            this.gridColumn5.FieldName = "wlgg";
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.VisibleIndex = 6;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn6
@@ -201,7 +199,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 50;
            // 
            // gridColumn7
@@ -213,7 +211,7 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 7;
            this.gridColumn7.VisibleIndex = 8;
            this.gridColumn7.Width = 50;
            // 
            // gridColumn9
@@ -229,7 +227,7 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 8;
            this.gridColumn9.VisibleIndex = 9;
            this.gridColumn9.Width = 50;
            // 
            // gv_purchaseUnit
@@ -250,27 +248,24 @@
            // 
            this.gridColumn10.Caption = "供应商";
            this.gridColumn10.FieldName = "gysName";
            this.gridColumn10.MinWidth = 50;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 9;
            this.gridColumn10.VisibleIndex = 10;
            this.gridColumn10.Width = 125;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "收料组织";
            this.gridColumn2.FieldName = "receivingOrg";
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.VisibleIndex = 11;
            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;
@@ -326,6 +321,16 @@
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn4
            //
            this.gridColumn4.Caption = "入库单号";
            this.gridColumn4.FieldName = "invBillNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            //
            // SelectMesCgthSq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -371,5 +376,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
    }
}
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs
@@ -23,9 +23,11 @@
        private string receiveOrgId = "";
        private string isWw = "";
        /// <summary>
        /// 供应商编号
       ///
        /// </summary>
        /// <param name="supp_no"></param>
       /// <param name="_suppId">供应商编号 </param>
       /// <param name="_receiveOrgId">组织编号</param>
       /// <param name="_isWw">2为委外,1为采购</param>
        public SelectMesCgthSq(string _suppId, string _receiveOrgId, string _isWw)
        {
            InitializeComponent();
@@ -84,7 +86,7 @@
                everyPageSize = pageSize,
                sortName = "",
                keyWhere = "",
                inBusType = isWw,
                inIsWw = this.isWw,
                inSupId = this.suppId,
                inReceiveOrgId = this.receiveOrgId,
            };