数据过滤

lu

昨天 bebb7b48326afd83927edd877eef53f4002d9a3f

数据过滤

 DevApp/Gs.DevApp/App.config

@@ -36,9 +36,9 @@
  </runtime>
    
  <appSettings>
    <add key="WebApiUrl" value="http://localhost:5263/" />
    <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
    <add key="WebApiUrl" value="http://192.168.1.145:81/" />
    <add key="LogPath" value="logs" />
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs

@@ -104,7 +104,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.cust_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs

@@ -108,7 +108,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc,a.departmentcode",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs

@@ -238,7 +238,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
                "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs

@@ -154,7 +154,10 @@
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
                "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs

@@ -265,7 +265,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and c.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_no",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs

@@ -134,7 +134,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.supp_no",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs

@@ -30,18 +30,18 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            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.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -107,10 +107,11 @@
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -245,7 +246,8 @@
            this.gv_returnType,
            this.gv_depotId,
            this.gv_remark,
            this.gridColumn1});
            this.gridColumn1,
            this.gridColumn8});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -440,9 +442,9 @@
            // 
            // txt_returnType
            // 
            this.txt_returnType.Location = new System.Drawing.Point(385, 12);
            this.txt_returnType.Location = new System.Drawing.Point(390, 12);
            this.txt_returnType.Name = "txt_returnType";
            this.txt_returnType.Size = new System.Drawing.Size(165, 24);
            this.txt_returnType.Size = new System.Drawing.Size(170, 24);
            this.txt_returnType.TabIndex = 533;
            this.txt_returnType.TextTxt = "";
            this.txt_returnType.WhereTxt = "a.s_type=\'生产退库原因\'  and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -471,7 +473,7 @@
            this.txt_thOrgId.IsReadly = false;
            this.txt_thOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_thOrgId.Name = "txt_thOrgId";
            this.txt_thOrgId.Size = new System.Drawing.Size(165, 24);
            this.txt_thOrgId.Size = new System.Drawing.Size(170, 24);
            this.txt_thOrgId.TabIndex = 526;
            // 
            // txt_billNo
@@ -479,17 +481,17 @@
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(942, 43);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 226;
            this.txt_checkDate.Tag = "readonly";
@@ -497,55 +499,55 @@
            // txt_depotId
            // 
            this.txt_depotId.IsReadly = false;
            this.txt_depotId.Location = new System.Drawing.Point(385, 43);
            this.txt_depotId.Location = new System.Drawing.Point(390, 43);
            this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Size = new System.Drawing.Size(165, 24);
            this.txt_depotId.Size = new System.Drawing.Size(170, 24);
            this.txt_depotId.TabIndex = 260;
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(385, 74);
            this.txt_remark.Location = new System.Drawing.Point(390, 74);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(436, 24);
            this.txt_remark.Size = new System.Drawing.Size(446, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 252;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 222;
            this.txt_checkUser.Tag = "readonly";
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(825, 74);
            this.txt_status.Location = new System.Drawing.Point(840, 74);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.Size = new System.Drawing.Size(274, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // txt_lastUpdateUser
            // 
            this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12);
            this.txt_lastUpdateUser.Location = new System.Drawing.Point(666, 12);
            this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
            this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.txt_lastUpdateUser.Size = new System.Drawing.Size(170, 24);
            this.txt_lastUpdateUser.StyleController = this.layoutMx1;
            this.txt_lastUpdateUser.TabIndex = 530;
            this.txt_lastUpdateUser.Tag = "readonly";
            // 
            // txt_lastUpdateTime
            // 
            this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
            this.txt_lastUpdateTime.Location = new System.Drawing.Point(666, 43);
            this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
            this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.txt_lastUpdateTime.Size = new System.Drawing.Size(170, 24);
            this.txt_lastUpdateTime.StyleController = this.layoutMx1;
            this.txt_lastUpdateTime.TabIndex = 531;
            this.txt_lastUpdateTime.Tag = "readonly";
@@ -599,30 +601,30 @@
            this.layoutControlItem4});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1126, 113);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -630,7 +632,7 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -640,60 +642,60 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_checkUser;
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem14.Text = "最后更新人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -701,23 +703,23 @@
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_depotId;
            this.layoutControlItem3.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Text = "选择仓库";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -729,7 +731,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -738,10 +740,10 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_returnType;
            this.layoutControlItem4.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem4.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Text = "退库原因";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -947,24 +949,13 @@
            // 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);
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(965, 64);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn6
            // 
@@ -985,6 +976,27 @@
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 1;
            this.gridColumn7.Width = 94;
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(965, 64);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "退货组织";
            this.gridColumn8.FieldName = "receivingOrg";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 9;
            this.gridColumn8.Width = 94;
            // 
            // Frm_MesSctkSq
            // 
@@ -1117,5 +1129,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs

@@ -407,7 +407,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.TH_ORG_ID in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs

@@ -154,7 +154,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and t.TH_ORG_ID in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/FrmMain.cs

@@ -485,7 +485,10 @@
        private void GetOrg()
        {
            string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
            System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
            sbSql.Append(" and IS_STATUS=1");
            sbSql.Append("  and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where  userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='组织' ) ");
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs

@@ -145,7 +145,11 @@
        private void getPageList(int curPage)
        {

            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.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());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs

@@ -428,7 +428,7 @@
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Tag = "org.fnamber";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 19;
            this.gridColumn8.VisibleIndex = 13;
            this.gridColumn8.Width = 200;
            // 
            // gv_caa001
@@ -566,7 +566,7 @@
            this.gv_caa010.OptionsColumn.AllowEdit = false;
            this.gv_caa010.Tag = "query_a.CAA010";
            this.gv_caa010.Visible = true;
            this.gv_caa010.VisibleIndex = 13;
            this.gv_caa010.VisibleIndex = 14;
            this.gv_caa010.Width = 180;
            // 
            // gv_caa011
@@ -579,7 +579,7 @@
            this.gv_caa011.OptionsColumn.AllowEdit = false;
            this.gv_caa011.Tag = "query_a.CAA011";
            this.gv_caa011.Visible = true;
            this.gv_caa011.VisibleIndex = 14;
            this.gv_caa011.VisibleIndex = 15;
            this.gv_caa011.Width = 180;
            // 
            // gv_saleOrderNo
@@ -624,7 +624,7 @@
            this.gv_caa016.OptionsColumn.AllowEdit = false;
            this.gv_caa016.Tag = "query_a.CAA016";
            this.gv_caa016.Visible = true;
            this.gv_caa016.VisibleIndex = 15;
            this.gv_caa016.VisibleIndex = 16;
            this.gv_caa016.Width = 100;
            // 
            // gridColumn7
@@ -684,7 +684,7 @@
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 16;
            this.gridColumn23.VisibleIndex = 17;
            this.gridColumn23.Width = 94;
            // 
            // gridColumn24
@@ -734,7 +734,7 @@
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 17;
            this.gridColumn31.VisibleIndex = 18;
            this.gridColumn31.Width = 94;
            // 
            // gridColumn32
@@ -784,7 +784,7 @@
            this.gridColumn38.MinWidth = 25;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 18;
            this.gridColumn38.VisibleIndex = 19;
            this.gridColumn38.Width = 94;
            // 
            // gridColumn39

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs

@@ -149,7 +149,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ERP_SCZZ in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs

@@ -556,7 +556,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ERP_SCZZ in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs

@@ -412,7 +412,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ERP_SCZZ in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1710,7 +1710,7 @@
        }
        public delegate void DelegateGetModel(string guid);
        public delegate void DelegateGetList(int currentPage);
       

        /// <summary>
        /// 
        /// </summary>
@@ -1829,7 +1829,8 @@
                        view.ActiveEditor.MouseUp += ActiveEditor_MouseUp;
                };
            }
            if (action2 != null) {
            if (action2 != null)
            {
                gridView1.FocusedRowChanged += (s, e) =>
                {
                    int _handle = gridView1.FocusedRowHandle;
@@ -1928,7 +1929,7 @@
                };
            }
        }
      

        private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
        {
            BaseEdit edit = sender as BaseEdit;
@@ -2117,7 +2118,20 @@
            }
        }


        /// <summary>
        /// 数据过滤
        /// </summary>
        /// <returns></returns>
        public static string GetOrgWhere()
        {
            System.Text.StringBuilder sb = new System.Text.StringBuilder();
            sb.Append(" (select aboutGuid as fid from  SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='组织')");
            return sb.ToString();
        }
        #endregion


        /// <summary>
        /// 判断是不是一个有效的数值
        /// </summary>

 DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs

@@ -45,12 +45,11 @@
            this.lookSearchSupplier.EditValue = "请选择";
            this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
            this.lookSearchSupplier.Name = "lookSearchSupplier";
           
            this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
            this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
            this.lookSearchSupplier.Size = new System.Drawing.Size(219, 28);
            this.lookSearchSupplier.Size = new System.Drawing.Size(219, 24);
            this.lookSearchSupplier.TabIndex = 8;
            // 
            // searchLookUpEdit1View