dev前台代码
上一版本: 10f72b58 | 补丁 | 提交 | 忽略空白
bug
lu
2025-08-27 b04c7177ea4f81ca5c0f9e7688b8df0e68587a93 
bug
已修改5个文件
214 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs


@@ -111,6 +111,10 @@


            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();


            this.tabMx = new DevExpress.XtraTab.XtraTabControl();


            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.gcMx1 = new DevExpress.XtraGrid.GridControl();


@@ -141,10 +145,8 @@


            this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();


            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -194,6 +196,10 @@


            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();


            this.tabMx.SuspendLayout();


            this.tabMxPage1.SuspendLayout();


@@ -202,10 +208,6 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();


            this.SuspendLayout();


            // 


            // toolBarMenu1


@@ -999,6 +1001,50 @@


            this.layItem2.Text = "采购部门";


            this.layItem2.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem5


            // 


            this.layoutControlItem5.Control = this.txt_returnMethod;


            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem5.Text = "退料方式";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem6


            // 


            this.layoutControlItem6.Control = this.txt_returnType;


            this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem6.Text = "退料原因";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_remark;


            this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem7.Text = "申请备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem8


            // 


            this.layoutControlItem8.Control = this.txt_isOut;


            this.layoutControlItem8.Location = new System.Drawing.Point(542, 56);


            this.layoutControlItem8.Name = "layoutControlItem8";


            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem8.Text = "委外标识";


            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem8.TextVisible = false;


            // 


            // tabMx


            // 


            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;


@@ -1055,7 +1101,9 @@


            this.gridColumn6,


            this.gridColumn8,


            this.gridColumn10,


            this.gridColumn9});


            this.gridColumn9,


            this.gridColumn12,


            this.gridColumn13});


            this.gvMx1.GridControl = this.gcMx1;


            this.gvMx1.Name = "gvMx1";


            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


@@ -1334,49 +1382,25 @@


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


            // layoutControlItem5


            // gridColumn12


            // 


            this.layoutControlItem5.Control = this.txt_returnMethod;


            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem5.Text = "退料方式";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);


            this.gridColumn12.Caption = "SRM标识";


            this.gridColumn12.FieldName = "isSrmChk";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 14;


            this.gridColumn12.Width = 94;


            // 


            // layoutControlItem6


            // gridColumn13


            // 


            this.layoutControlItem6.Control = this.txt_returnType;


            this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem6.Text = "退料原因";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_remark;


            this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem7.Text = "申请备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem8


            // 


            this.layoutControlItem8.Control = this.txt_isOut;


            this.layoutControlItem8.Location = new System.Drawing.Point(542, 56);


            this.layoutControlItem8.Name = "layoutControlItem8";


            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);


            this.layoutControlItem8.Text = "委外标识";


            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem8.TextVisible = false;


            this.gridColumn13.Caption = "SRM到货单号";


            this.gridColumn13.FieldName = "paperBillNo";


            this.gridColumn13.MinWidth = 25;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 15;


            this.gridColumn13.Width = 94;


            // 


            // Frm_MesCgthSq


            // 


@@ -1437,6 +1461,10 @@


            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();


            this.tabMx.ResumeLayout(false);


            this.tabMxPage1.ResumeLayout(false);


@@ -1445,10 +1473,6 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();


            this.ResumeLayout(false);




        }


@@ -1549,5 +1573,7 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;


    }


}




 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs


@@ -121,6 +121,7 @@


            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -273,7 +274,8 @@


            this.gridColumn3,


            this.gridColumn17,


            this.gridColumn18,


            this.gridColumn19});


            this.gridColumn19,


            this.gridColumn20});


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


@@ -1077,6 +1079,16 @@


            this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);


            this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);


            // 


            // gridColumn20


            // 


            this.gridColumn20.Caption = "收料组织";


            this.gridColumn20.FieldName = "fSubsidiary";


            this.gridColumn20.MinWidth = 25;


            this.gridColumn20.Name = "gridColumn20";


            this.gridColumn20.Visible = true;


            this.gridColumn20.VisibleIndex = 15;


            this.gridColumn20.Width = 94;


            // 


            // MesQcExceptional


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);


@@ -1228,5 +1240,6 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;


    }


}




 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs


@@ -142,7 +142,7 @@


        {


            gcMain1.DataSource = null;


            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();


            _sbSqlWhere.Append(" arn.ReceiveOrgId in");


            _sbSqlWhere.Append(" and arn.ReceiveOrgId in");


            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());


            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));


            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());




 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs


@@ -73,6 +73,7 @@


            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.pageBar1 = new UserControls.Data.UcPageBar();


            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();


            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();


@@ -300,7 +301,8 @@


            this.gridColumn5,


            this.gv_remark,


            this.gridColumn4,


            this.gridColumn11});


            this.gridColumn11,


            this.gridColumn7});


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


@@ -474,6 +476,16 @@


            this.gridColumn11.MinWidth = 25;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Width = 94;


            // 


            // gridColumn7


            // 


            this.gridColumn7.Caption = "SRM到货单号";


            this.gridColumn7.FieldName = "paperBillNo";


            this.gridColumn7.MinWidth = 25;


            this.gridColumn7.Name = "gridColumn7";


            this.gridColumn7.Visible = true;


            this.gridColumn7.VisibleIndex = 13;


            this.gridColumn7.Width = 94;


            // 


            // pageBar1


            // 


@@ -1597,5 +1609,6 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;


    }


}




 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs


@@ -50,9 +50,11 @@


            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();


            this.btnIn = new DevExpress.XtraEditors.SimpleButton();


            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();


            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();


            this.panelControl3.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();


@@ -127,7 +129,9 @@


            this.gridColumn1,


            this.gridColumn8,


            this.gridColumn11,


            this.gridColumn12});


            this.gridColumn12,


            this.gridColumn13,


            this.gridColumn14});


            this.gridView1.GridControl = this.gcMain;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


@@ -329,6 +333,36 @@


            this.gridColumn11.VisibleIndex = 7;


            this.gridColumn11.Width = 94;


            // 


            // gridColumn12


            // 


            this.gridColumn12.Caption = "当前库存";


            this.gridColumn12.FieldName = "kcQty";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 8;


            this.gridColumn12.Width = 94;


            // 


            // gridColumn13


            // 


            this.gridColumn13.Caption = "SRM送货单";


            this.gridColumn13.FieldName = "paperBillNo";


            this.gridColumn13.MinWidth = 25;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 14;


            this.gridColumn13.Width = 94;


            // 


            // gridColumn14


            // 


            this.gridColumn14.Caption = "SRM标识";


            this.gridColumn14.FieldName = "isSrmChk";


            this.gridColumn14.MinWidth = 25;


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 15;


            this.gridColumn14.Width = 94;


            // 


            // panelControl1


            // 


            this.panelControl1.Controls.Add(this.btnIn);


@@ -349,16 +383,6 @@


            this.btnIn.Size = new System.Drawing.Size(94, 39);


            this.btnIn.TabIndex = 4;


            this.btnIn.Text = "确定导入";


            // 


            // gridColumn12


            // 


            this.gridColumn12.Caption = "当前库存";


            this.gridColumn12.FieldName = "kcQty";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 8;


            this.gridColumn12.Width = 94;


            // 


            // SelectMesCgthSq


            // 


@@ -413,5 +437,7 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;


        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;


    }


}