数据过滤

lu

5 天以前 b401548e93334943320e2a4a6b11341cf8a5fecf

数据过滤

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs

@@ -348,7 +348,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, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs

@@ -156,7 +156,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 xxorg.FID 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/Sales/Frm_SalesOrder.cs

@@ -107,7 +107,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 xszz.FID in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs

@@ -598,7 +598,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 xs.FID 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/Sales/Frm_SalesReturnNoticeDj.cs

@@ -143,7 +143,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 org.fid 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/WW/Frm_ProductionOrder.Designer.cs

@@ -125,6 +125,7 @@
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -151,12 +152,12 @@
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -174,7 +175,6 @@
            this.gvMx1trackingNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1batchNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1warehouse = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1issuingMethod = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1supplyingType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1compositionQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -201,7 +201,6 @@
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -258,6 +257,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -284,19 +284,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -1273,6 +1272,17 @@
            this.layoutControlItem32.Text = "产品ID";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_batchNo;
            this.layoutControlItem8.Location = new System.Drawing.Point(542, 196);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem8.Text = "批号";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1618,17 +1628,6 @@
            this.layoutControlItem30.Text = "Mes审核状态";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_batchNo;
            this.layoutControlItem8.Location = new System.Drawing.Point(542, 196);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem8.Text = "批号";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem22
            // 
            this.layoutControlItem22.Control = this.txt_storageLowerLimit;
@@ -1684,6 +1683,18 @@
            this.layoutControlItem35.Text = "未入库数";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_remarks;
            this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
            this.layoutControlItem28.Text = "备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1732,7 +1743,6 @@
            this.gvMx1trackingNo,
            this.gvMx1batchNo,
            this.gvMx1warehouse,
            this.gvMx1issuingMethod,
            this.gvMx1unit,
            this.gvMx1supplyingType,
            this.gvMx1compositionQty,
@@ -1916,18 +1926,6 @@
            this.gvMx1warehouse.VisibleIndex = 12;
            this.gvMx1warehouse.Width = 94;
            // 
            // gvMx1issuingMethod
            // 
            this.gvMx1issuingMethod.AppearanceCell.Options.UseFont = true;
            this.gvMx1issuingMethod.Caption = "发料方式 ";
            this.gvMx1issuingMethod.FieldName = "issuingMethod";
            this.gvMx1issuingMethod.MinWidth = 50;
            this.gvMx1issuingMethod.Name = "gvMx1issuingMethod";
            this.gvMx1issuingMethod.Tag = "query_a.ISSUING_METHOD";
            this.gvMx1issuingMethod.Visible = true;
            this.gvMx1issuingMethod.VisibleIndex = 13;
            this.gvMx1issuingMethod.Width = 94;
            // 
            // gvMx1unit
            // 
            this.gvMx1unit.AppearanceCell.Options.UseFont = true;
@@ -1937,7 +1935,7 @@
            this.gvMx1unit.Name = "gvMx1unit";
            this.gvMx1unit.Tag = "query_a.UNIT";
            this.gvMx1unit.Visible = true;
            this.gvMx1unit.VisibleIndex = 14;
            this.gvMx1unit.VisibleIndex = 13;
            this.gvMx1unit.Width = 60;
            // 
            // gvMx1supplyingType
@@ -1949,7 +1947,7 @@
            this.gvMx1supplyingType.Name = "gvMx1supplyingType";
            this.gvMx1supplyingType.Tag = "query_a.SUPPLYING_TYPE";
            this.gvMx1supplyingType.Visible = true;
            this.gvMx1supplyingType.VisibleIndex = 15;
            this.gvMx1supplyingType.VisibleIndex = 14;
            this.gvMx1supplyingType.Width = 94;
            // 
            // gvMx1compositionQty
@@ -1961,7 +1959,7 @@
            this.gvMx1compositionQty.Name = "gvMx1compositionQty";
            this.gvMx1compositionQty.Tag = "query_a.COMPOSITION_QTY";
            this.gvMx1compositionQty.Visible = true;
            this.gvMx1compositionQty.VisibleIndex = 16;
            this.gvMx1compositionQty.VisibleIndex = 15;
            this.gvMx1compositionQty.Width = 50;
            // 
            // gvMx1isSubstitute
@@ -1973,7 +1971,7 @@
            this.gvMx1isSubstitute.Name = "gvMx1isSubstitute";
            this.gvMx1isSubstitute.Tag = "query_a.IS_SUBSTITUTE";
            this.gvMx1isSubstitute.Visible = true;
            this.gvMx1isSubstitute.VisibleIndex = 17;
            this.gvMx1isSubstitute.VisibleIndex = 16;
            this.gvMx1isSubstitute.Width = 50;
            // 
            // gvMx1numerator
@@ -1985,7 +1983,7 @@
            this.gvMx1numerator.Name = "gvMx1numerator";
            this.gvMx1numerator.Tag = "query_a.NUMERATOR";
            this.gvMx1numerator.Visible = true;
            this.gvMx1numerator.VisibleIndex = 18;
            this.gvMx1numerator.VisibleIndex = 17;
            this.gvMx1numerator.Width = 94;
            // 
            // gvMx1denominator
@@ -1997,7 +1995,7 @@
            this.gvMx1denominator.Name = "gvMx1denominator";
            this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
            this.gvMx1denominator.Visible = true;
            this.gvMx1denominator.VisibleIndex = 19;
            this.gvMx1denominator.VisibleIndex = 18;
            this.gvMx1denominator.Width = 94;
            // 
            // gvMx1fixedLoss
@@ -2009,7 +2007,7 @@
            this.gvMx1fixedLoss.Name = "gvMx1fixedLoss";
            this.gvMx1fixedLoss.Tag = "query_a.FIXED_LOSS";
            this.gvMx1fixedLoss.Visible = true;
            this.gvMx1fixedLoss.VisibleIndex = 20;
            this.gvMx1fixedLoss.VisibleIndex = 19;
            this.gvMx1fixedLoss.Width = 94;
            // 
            // gvMx1variableLossRate
@@ -2021,7 +2019,7 @@
            this.gvMx1variableLossRate.Name = "gvMx1variableLossRate";
            this.gvMx1variableLossRate.Tag = "query_a.VARIABLE_LOSS_RATE";
            this.gvMx1variableLossRate.Visible = true;
            this.gvMx1variableLossRate.VisibleIndex = 21;
            this.gvMx1variableLossRate.VisibleIndex = 20;
            this.gvMx1variableLossRate.Width = 60;
            // 
            // gvMx1salesOrderNo
@@ -2033,7 +2031,7 @@
            this.gvMx1salesOrderNo.Name = "gvMx1salesOrderNo";
            this.gvMx1salesOrderNo.Tag = "query_a.SALES_ORDER_NO";
            this.gvMx1salesOrderNo.Visible = true;
            this.gvMx1salesOrderNo.VisibleIndex = 22;
            this.gvMx1salesOrderNo.VisibleIndex = 21;
            this.gvMx1salesOrderNo.Width = 94;
            // 
            // gvMx1itemNo
@@ -2045,7 +2043,7 @@
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx1itemNo.Visible = true;
            this.gvMx1itemNo.VisibleIndex = 23;
            this.gvMx1itemNo.VisibleIndex = 22;
            this.gvMx1itemNo.Width = 94;
            // 
            // gvMx1ownerType
@@ -2057,7 +2055,7 @@
            this.gvMx1ownerType.Name = "gvMx1ownerType";
            this.gvMx1ownerType.Tag = "query_a.OWNER_TYPE";
            this.gvMx1ownerType.Visible = true;
            this.gvMx1ownerType.VisibleIndex = 24;
            this.gvMx1ownerType.VisibleIndex = 23;
            this.gvMx1ownerType.Width = 94;
            // 
            // gvMx1owner
@@ -2079,7 +2077,7 @@
            this.gvMx1fsrctransorgid.Name = "gvMx1fsrctransorgid";
            this.gvMx1fsrctransorgid.Tag = "query_a.FSRCTRANSORGID";
            this.gvMx1fsrctransorgid.Visible = true;
            this.gvMx1fsrctransorgid.VisibleIndex = 25;
            this.gvMx1fsrctransorgid.VisibleIndex = 24;
            this.gvMx1fsrctransorgid.Width = 94;
            // 
            // gvMx1fsrctransstockid
@@ -2091,7 +2089,7 @@
            this.gvMx1fsrctransstockid.Name = "gvMx1fsrctransstockid";
            this.gvMx1fsrctransstockid.Tag = "query_a.FSRCTRANSSTOCKID";
            this.gvMx1fsrctransstockid.Visible = true;
            this.gvMx1fsrctransstockid.VisibleIndex = 26;
            this.gvMx1fsrctransstockid.VisibleIndex = 25;
            this.gvMx1fsrctransstockid.Width = 94;
            // 
            // gvMx1fstockstatusid
@@ -2103,7 +2101,7 @@
            this.gvMx1fstockstatusid.Name = "gvMx1fstockstatusid";
            this.gvMx1fstockstatusid.Tag = "query_a.FSTOCKSTATUSID";
            this.gvMx1fstockstatusid.Visible = true;
            this.gvMx1fstockstatusid.VisibleIndex = 28;
            this.gvMx1fstockstatusid.VisibleIndex = 27;
            this.gvMx1fstockstatusid.Width = 94;
            // 
            // gvMx1fneeddate
@@ -2115,7 +2113,7 @@
            this.gvMx1fneeddate.Name = "gvMx1fneeddate";
            this.gvMx1fneeddate.Tag = "query_a.FNEEDDATE";
            this.gvMx1fneeddate.Visible = true;
            this.gvMx1fneeddate.VisibleIndex = 29;
            this.gvMx1fneeddate.VisibleIndex = 28;
            this.gvMx1fneeddate.Width = 94;
            // 
            // gvMx1fmemo
@@ -2127,7 +2125,7 @@
            this.gvMx1fmemo.Name = "gvMx1fmemo";
            this.gvMx1fmemo.Tag = "query_a.FMEMO";
            this.gvMx1fmemo.Visible = true;
            this.gvMx1fmemo.VisibleIndex = 30;
            this.gvMx1fmemo.VisibleIndex = 29;
            this.gvMx1fmemo.Width = 94;
            // 
            // gvMx1typeb
@@ -2139,7 +2137,7 @@
            this.gvMx1typeb.Name = "gvMx1typeb";
            this.gvMx1typeb.Tag = "query_a.TYPEB";
            this.gvMx1typeb.Visible = true;
            this.gvMx1typeb.VisibleIndex = 27;
            this.gvMx1typeb.VisibleIndex = 26;
            this.gvMx1typeb.Width = 50;
            // 
            // gridColumn8
@@ -2149,7 +2147,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 31;
            this.gridColumn8.VisibleIndex = 30;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn9
@@ -2159,7 +2157,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 32;
            this.gridColumn9.VisibleIndex = 31;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
@@ -2169,7 +2167,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 33;
            this.gridColumn10.VisibleIndex = 32;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
@@ -2179,7 +2177,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 34;
            this.gridColumn11.VisibleIndex = 33;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
@@ -2189,7 +2187,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 35;
            this.gridColumn12.VisibleIndex = 34;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
@@ -2199,7 +2197,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 36;
            this.gridColumn13.VisibleIndex = 35;
            this.gridColumn13.Width = 94;
            // 
            // picCheckBox
@@ -2212,18 +2210,6 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_remarks;
            this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
            this.layoutControlItem28.Text = "备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
            // 
            // Frm_ProductionOrder
            // 
@@ -2291,6 +2277,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -2317,19 +2304,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            this.ResumeLayout(false);

        }
@@ -2447,7 +2433,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1trackingNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1batchNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1warehouse;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1issuingMethod;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyingType;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1compositionQty;

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs

@@ -161,7 +161,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 hzOrg.FID in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs

@@ -124,6 +124,7 @@
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            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.gridColumn9,
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12});
            this.gridColumn12,
            this.gridColumn20});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -1195,6 +1197,16 @@
            this.gridColumn19.VisibleIndex = 4;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
            // 
            this.gridColumn20.Caption = "入库货主";
            this.gridColumn20.FieldName = "stockownerName";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 13;
            this.gridColumn20.Width = 94;
            // 
            // Frm_WwGd
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1346,5 +1358,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs

@@ -173,7 +173,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 hzOrg.FID 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/Warehouse/Frm_MesRohIn.cs

@@ -112,7 +112,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 cgOrg.fid in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);