From e05d0fe213a88c4612491647adae3633479dda89 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期三, 10 十二月 2025 15:15:33 +0800
Subject: [PATCH] 生产的四个报表

---
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.cs           |  134 +++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.cs             |  144 +++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.cs          |  155 +++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.resx        |  123 ++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.resx         |  123 ++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.resx           |  123 ++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.resx          |  123 ++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.Designer.cs   |  381 ++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.Designer.cs  |  396 +++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.Designer.cs    |  396 +++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.Designer.cs |  381 ++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.cs            |  156 +++
 12 files changed, 2,635 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.Designer.cs
new file mode 100644
index 0000000..f23e7a1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.Designer.cs
@@ -0,0 +1,396 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+    partial class YS_cjbgmx
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.mesReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.erpReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectionNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.purchaseOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.qualifiedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDuration = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectorName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = "鏌ヨ";
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.mesReceiptNo,
+            this.erpReceiptNo,
+            this.inspectionNo,
+            this.purchaseOrderNo,
+            this.itemCode,
+            this.itemName,
+            this.itemModel,
+            this.supplierCode,
+            this.supplierName,
+            this.qualifiedQty,
+            this.inboundQty,
+            this.inboundDate,
+            this.inboundDuration,
+            this.inspectorName,
+            this.inboundStatus});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+                        //
+            // mesReceiptNo
+            //
+            this.mesReceiptNo.Caption = "鎶ュ伐鏃ユ湡";
+            this.mesReceiptNo.FieldName = "reportingDate";
+            this.mesReceiptNo.MinWidth = 30;
+            this.mesReceiptNo.Name = "reportingDate";
+            this.mesReceiptNo.Tag = "reportingDate";
+            this.mesReceiptNo.Visible = true;
+            this.mesReceiptNo.VisibleIndex = 0;
+            this.mesReceiptNo.Width = 120;
+            //
+            // erpReceiptNo
+            //
+            this.erpReceiptNo.Caption = "鎺掍骇鏃ユ湡";
+            this.erpReceiptNo.FieldName = "schedulingDate";
+            this.erpReceiptNo.MinWidth = 30;
+            this.erpReceiptNo.Name = "schedulingDate";
+            this.erpReceiptNo.Tag = "schedulingDate";
+            this.erpReceiptNo.Visible = true;
+            this.erpReceiptNo.VisibleIndex = 1;
+            this.erpReceiptNo.Width = 120;
+            //
+            // inspectionNo
+            //
+            this.inspectionNo.Caption = "宸ュ崟";
+            this.inspectionNo.FieldName = "workOrder";
+            this.inspectionNo.MinWidth = 30;
+            this.inspectionNo.Name = "workOrder";
+            this.inspectionNo.Tag = "workOrder";
+            this.inspectionNo.Visible = true;
+            this.inspectionNo.VisibleIndex = 2;
+            this.inspectionNo.Width = 120;
+            //
+            // purchaseOrderNo
+            //
+            this.purchaseOrderNo.Caption = "鐘舵��";
+            this.purchaseOrderNo.FieldName = "status";
+            this.purchaseOrderNo.MinWidth = 30;
+            this.purchaseOrderNo.Name = "status";
+            this.purchaseOrderNo.Tag = "status";
+            this.purchaseOrderNo.Visible = true;
+            this.purchaseOrderNo.VisibleIndex = 3;
+            this.purchaseOrderNo.Width = 120;
+            //
+            // itemCode
+            //
+            this.itemCode.Caption = "宸ュ崟鍙�";
+            this.itemCode.FieldName = "workOrderNo";
+            this.itemCode.MinWidth = 30;
+            this.itemCode.Name = "workOrderNo";
+            this.itemCode.Tag = "workOrderNo";
+            this.itemCode.Visible = true;
+            this.itemCode.VisibleIndex = 4;
+            this.itemCode.Width = 120;
+            //
+            // itemName
+            //
+            this.itemName.Caption = "鐗╂枡缂栫爜";
+            this.itemName.FieldName = "itemCode";
+            this.itemName.MinWidth = 30;
+            this.itemName.Name = "itemCode";
+            this.itemName.Tag = "itemCode";
+            this.itemName.Visible = true;
+            this.itemName.VisibleIndex = 5;
+            this.itemName.Width = 150;
+            //
+            // itemModel
+            //
+            this.itemModel.Caption = "鐗╂枡鍚嶇О";
+            this.itemModel.FieldName = "itemName";
+            this.itemModel.MinWidth = 30;
+            this.itemModel.Name = "itemName";
+            this.itemModel.Tag = "itemName";
+            this.itemModel.Visible = true;
+            this.itemModel.VisibleIndex = 6;
+            this.itemModel.Width = 120;
+            //
+            // supplierCode
+            //
+            this.supplierCode.Caption = "鐗╂枡瑙勬牸";
+            this.supplierCode.FieldName = "itemSpec";
+            this.supplierCode.MinWidth = 30;
+            this.supplierCode.Name = "itemSpec";
+            this.supplierCode.Tag = "itemSpec";
+            this.supplierCode.Visible = true;
+            this.supplierCode.VisibleIndex = 7;
+            this.supplierCode.Width = 120;
+            //
+            // supplierName
+            //
+            this.supplierName.Caption = "宸ュ崟鏁伴噺";
+            this.supplierName.FieldName = "workOrderQty";
+            this.supplierName.MinWidth = 30;
+            this.supplierName.Name = "workOrderQty";
+            this.supplierName.Tag = "workOrderQty";
+            this.supplierName.Visible = true;
+            this.supplierName.VisibleIndex = 8;
+            this.supplierName.Width = 150;
+            //
+            // qualifiedQty
+            //
+            this.qualifiedQty.Caption = "鎶ュ伐鏁伴噺";
+            this.qualifiedQty.FieldName = "reportingQty";
+            this.qualifiedQty.MinWidth = 30;
+            this.qualifiedQty.Name = "reportingQty";
+            this.qualifiedQty.Tag = "reportingQty";
+            this.qualifiedQty.Visible = true;
+            this.qualifiedQty.VisibleIndex = 9;
+            this.qualifiedQty.Width = 100;
+            //
+            // inboundQty
+            //
+            this.inboundQty.Caption = "妫�楠岀粨鏋�";
+            this.inboundQty.FieldName = "inspectionResult";
+            this.inboundQty.MinWidth = 30;
+            this.inboundQty.Name = "inspectionResult";
+            this.inboundQty.Tag = "inspectionResult";
+            this.inboundQty.Visible = true;
+            this.inboundQty.VisibleIndex = 10;
+            this.inboundQty.Width = 100;
+            //
+            // inboundDate
+            //
+            this.inboundDate.Caption = "妫�楠屾暟閲�";
+            this.inboundDate.FieldName = "inspectionQty";
+            this.inboundDate.MinWidth = 30;
+            this.inboundDate.Name = "inspectionQty";
+            this.inboundDate.Tag = "inspectionQty";
+            this.inboundDate.Visible = true;
+            this.inboundDate.VisibleIndex = 11;
+            this.inboundDate.Width = 120;
+            //
+            // inboundDuration
+            //
+            this.inboundDuration.Caption = "鍏ュ簱鏁伴噺";
+            this.inboundDuration.FieldName = "inboundQty";
+            this.inboundDuration.MinWidth = 30;
+            this.inboundDuration.Name = "inboundQty";
+            this.inboundDuration.Tag = "inboundQty";
+            this.inboundDuration.Visible = true;
+            this.inboundDuration.VisibleIndex = 12;
+            this.inboundDuration.Width = 120;
+            //
+            // inspectorName
+            //
+            this.inspectorName.Caption = "鏉$爜寮犳暟";
+            this.inspectorName.FieldName = "barcodeCount";
+            this.inspectorName.MinWidth = 30;
+            this.inspectorName.Name = "barcodeCount";
+            this.inspectorName.Tag = "barcodeCount";
+            this.inspectorName.Visible = true;
+            this.inspectorName.VisibleIndex = 13;
+            this.inspectorName.Width = 100;
+            //
+            // inboundStatus
+            //
+            this.inboundStatus.Caption = "鎶ュ伐浜�";
+            this.inboundStatus.FieldName = "reportingStaff";
+            this.inboundStatus.MinWidth = 30;
+            this.inboundStatus.Name = "reportingStaff";
+            this.inboundStatus.Tag = "reportingStaff";
+            this.inboundStatus.Visible = true;
+            this.inboundStatus.VisibleIndex = 14;
+            this.inboundStatus.Width = 100;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1});
+            // 
+            // YS_rkjreport
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "YS_rkjreport";
+            this.Text = "鍏ュ簱妫�鎶ヨ〃";
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraGrid.Columns.GridColumn mesReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn erpReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectionNo;
+        private DevExpress.XtraGrid.Columns.GridColumn purchaseOrderNo;
+        private DevExpress.XtraGrid.Columns.GridColumn itemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn itemName;
+        private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierCode;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierName;
+        private DevExpress.XtraGrid.Columns.GridColumn qualifiedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDate;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDuration;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectorName;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundStatus;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.cs
new file mode 100644
index 0000000..3cd7f36
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.cs
@@ -0,0 +1,134 @@
+using DevExpress.XtraTreeList.Data;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class YS_cjbgmx : DevExpress.XtraEditors.XtraForm
+    {
+        //鍏ュ簱妫�鎶ヨ〃
+        string _webServiceName = "YS_rkjreport/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public YS_cjbgmx()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+            {
+
+            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageWorkProdReport", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.resx
new file mode 100644
index 0000000..a4826a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_cjbgmx.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.Designer.cs
new file mode 100644
index 0000000..b0cc2af
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.Designer.cs
@@ -0,0 +1,396 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+    partial class YS_scrk
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.mesReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.erpReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectionNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.purchaseOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.qualifiedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDuration = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectorName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = "鏌ヨ";
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.mesReceiptNo,
+            this.erpReceiptNo,
+            this.inspectionNo,
+            this.purchaseOrderNo,
+            this.itemCode,
+            this.itemName,
+            this.itemModel,
+            this.supplierCode,
+            this.supplierName,
+            this.qualifiedQty,
+            this.inboundQty,
+            this.inboundDate,
+            this.inboundDuration,
+            this.inspectorName,
+            this.inboundStatus});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+                        //
+            // mesReceiptNo
+            //
+            this.mesReceiptNo.Caption = "鎶ュ伐鏃ユ湡";
+            this.mesReceiptNo.FieldName = "reportDate";
+            this.mesReceiptNo.MinWidth = 30;
+            this.mesReceiptNo.Name = "reportDate";
+            this.mesReceiptNo.Tag = "reportDate";
+            this.mesReceiptNo.Visible = true;
+            this.mesReceiptNo.VisibleIndex = 0;
+            this.mesReceiptNo.Width = 120;
+            //
+            // erpReceiptNo
+            //
+            this.erpReceiptNo.Caption = "宸ュ崟鍙�";
+            this.erpReceiptNo.FieldName = "workOrderNo";
+            this.erpReceiptNo.MinWidth = 30;
+            this.erpReceiptNo.Name = "workOrderNo";
+            this.erpReceiptNo.Tag = "workOrderNo";
+            this.erpReceiptNo.Visible = true;
+            this.erpReceiptNo.VisibleIndex = 1;
+            this.erpReceiptNo.Width = 120;
+            //
+            // inspectionNo
+            //
+            this.inspectionNo.Caption = "鐗╂枡缂栫爜";
+            this.inspectionNo.FieldName = "itemCode";
+            this.inspectionNo.MinWidth = 30;
+            this.inspectionNo.Name = "itemCode";
+            this.inspectionNo.Tag = "itemCode";
+            this.inspectionNo.Visible = true;
+            this.inspectionNo.VisibleIndex = 2;
+            this.inspectionNo.Width = 120;
+            //
+            // purchaseOrderNo
+            //
+            this.purchaseOrderNo.Caption = "鐗╂枡鍚嶇О";
+            this.purchaseOrderNo.FieldName = "itemName";
+            this.purchaseOrderNo.MinWidth = 30;
+            this.purchaseOrderNo.Name = "itemName";
+            this.purchaseOrderNo.Tag = "itemName";
+            this.purchaseOrderNo.Visible = true;
+            this.purchaseOrderNo.VisibleIndex = 3;
+            this.purchaseOrderNo.Width = 120;
+            //
+            // itemCode
+            //
+            this.itemCode.Caption = "鐗╂枡瑙勬牸";
+            this.itemCode.FieldName = "itemSpec";
+            this.itemCode.MinWidth = 30;
+            this.itemCode.Name = "itemSpec";
+            this.itemCode.Tag = "itemSpec";
+            this.itemCode.Visible = true;
+            this.itemCode.VisibleIndex = 4;
+            this.itemCode.Width = 120;
+            //
+            // itemName
+            //
+            this.itemName.Caption = "宸ュ崟鏁伴噺";
+            this.itemName.FieldName = "workOrderQty";
+            this.itemName.MinWidth = 30;
+            this.itemName.Name = "workOrderQty";
+            this.itemName.Tag = "workOrderQty";
+            this.itemName.Visible = true;
+            this.itemName.VisibleIndex = 5;
+            this.itemName.Width = 150;
+            //
+            // itemModel
+            //
+            this.itemModel.Caption = "鍏ュ簱鏁伴噺";
+            this.itemModel.FieldName = "inboundQty";
+            this.itemModel.MinWidth = 30;
+            this.itemModel.Name = "inboundQty";
+            this.itemModel.Tag = "inboundQty";
+            this.itemModel.Visible = true;
+            this.itemModel.VisibleIndex = 6;
+            this.itemModel.Width = 120;
+            //
+            // supplierCode
+            //
+            this.supplierCode.Caption = "鏈叆搴撴暟閲�";
+            this.supplierCode.FieldName = "uninboundQty";
+            this.supplierCode.MinWidth = 30;
+            this.supplierCode.Name = "uninboundQty";
+            this.supplierCode.Tag = "uninboundQty";
+            this.supplierCode.Visible = true;
+            this.supplierCode.VisibleIndex = 7;
+            this.supplierCode.Width = 120;
+            //
+            // supplierName
+            //
+            this.supplierName.Caption = "鎺掍骇鏃ユ湡";
+            this.supplierName.FieldName = "schedulingDate";
+            this.supplierName.MinWidth = 30;
+            this.supplierName.Name = "schedulingDate";
+            this.supplierName.Tag = "schedulingDate";
+            this.supplierName.Visible = true;
+            this.supplierName.VisibleIndex = 8;
+            this.supplierName.Width = 150;
+            //
+            // qualifiedQty
+            //
+            this.qualifiedQty.Caption = "宸ュ崟鐘舵��";
+            this.qualifiedQty.FieldName = "status";
+            this.qualifiedQty.MinWidth = 30;
+            this.qualifiedQty.Name = "status";
+            this.qualifiedQty.Tag = "status";
+            this.qualifiedQty.Visible = true;
+            this.qualifiedQty.VisibleIndex = 9;
+            this.qualifiedQty.Width = 100;
+            //
+            // inboundQty
+            //
+            this.inboundQty.Caption = "妫�楠岀粨鏋�";
+            this.inboundQty.FieldName = "inspectionResult";
+            this.inboundQty.MinWidth = 30;
+            this.inboundQty.Name = "inspectionResult";
+            this.inboundQty.Tag = "inspectionResult";
+            this.inboundQty.Visible = true;
+            this.inboundQty.VisibleIndex = 10;
+            this.inboundQty.Width = 100;
+            //
+            // inboundDate
+            //
+            this.inboundDate.Caption = "妫�楠屾暟閲�";
+            this.inboundDate.FieldName = "inspectionQty";
+            this.inboundDate.MinWidth = 30;
+            this.inboundDate.Name = "inspectionQty";
+            this.inboundDate.Tag = "inspectionQty";
+            this.inboundDate.Visible = true;
+            this.inboundDate.VisibleIndex = 11;
+            this.inboundDate.Width = 120;
+            //
+            // inboundDuration
+            //
+            this.inboundDuration.Caption = "鎶ュ伐鏁伴噺";
+            this.inboundDuration.FieldName = "reportingQty";
+            this.inboundDuration.MinWidth = 30;
+            this.inboundDuration.Name = "reportingQty";
+            this.inboundDuration.Tag = "reportingQty";
+            this.inboundDuration.Visible = true;
+            this.inboundDuration.VisibleIndex = 12;
+            this.inboundDuration.Width = 120;
+            //
+            // inspectorName
+            //
+            this.inspectorName.Caption = "鏉$爜寮犳暟";
+            this.inspectorName.FieldName = "barcodeCount";
+            this.inspectorName.MinWidth = 30;
+            this.inspectorName.Name = "barcodeCount";
+            this.inspectorName.Tag = "barcodeCount";
+            this.inspectorName.Visible = true;
+            this.inspectorName.VisibleIndex = 13;
+            this.inspectorName.Width = 100;
+            //
+            // inboundStatus
+            //
+            this.inboundStatus.Caption = "鎶ュ伐浜�";
+            this.inboundStatus.FieldName = "reportingStaff";
+            this.inboundStatus.MinWidth = 30;
+            this.inboundStatus.Name = "reportingStaff";
+            this.inboundStatus.Tag = "reportingStaff";
+            this.inboundStatus.Visible = true;
+            this.inboundStatus.VisibleIndex = 14;
+            this.inboundStatus.Width = 100;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1});
+            // 
+            // YS_rkjreport
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "YS_rkjreport";
+            this.Text = "鍏ュ簱妫�鎶ヨ〃";
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraGrid.Columns.GridColumn mesReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn erpReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectionNo;
+        private DevExpress.XtraGrid.Columns.GridColumn purchaseOrderNo;
+        private DevExpress.XtraGrid.Columns.GridColumn itemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn itemName;
+        private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierCode;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierName;
+        private DevExpress.XtraGrid.Columns.GridColumn qualifiedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDate;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDuration;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectorName;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundStatus;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.cs
new file mode 100644
index 0000000..43e11ac
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.cs
@@ -0,0 +1,144 @@
+using DevExpress.XtraTreeList.Data;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class YS_scrk : DevExpress.XtraEditors.XtraForm
+    {
+        //鍏ュ簱妫�鎶ヨ〃
+        string _webServiceName = "YS_rkjreport/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public YS_scrk()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+            {
+
+            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageProductionInventoryReport", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    //reportDate(鎶ュ伐鏃ユ湡)
+                    //workOrderNo(宸ュ崟鍙�)
+                    //itemCode(鐗╂枡缂栫爜)
+                    //itemName(鐗╂枡鍚嶇О)
+                    //itemSpec(鐗╂枡瑙勬牸)
+                    //workOrderQty(宸ュ崟鏁伴噺)
+                    //inboundQty(鍏ュ簱鏁伴噺)
+                    //uninboundQty(鏈叆搴撴暟閲�)
+
+
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.resx
new file mode 100644
index 0000000..a4826a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_scrk.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.Designer.cs
new file mode 100644
index 0000000..0346c1f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.Designer.cs
@@ -0,0 +1,381 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+    partial class YS_tmdrk
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.mesReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.erpReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectionNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.purchaseOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.qualifiedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDuration = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectorName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = "鏌ヨ";
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.mesReceiptNo,
+            this.erpReceiptNo,
+            this.inspectionNo,
+            this.purchaseOrderNo,
+            this.itemCode,
+            this.itemName,
+            this.itemModel,
+            this.supplierCode,
+            this.supplierName,
+            this.qualifiedQty,
+            this.inboundQty,
+            this.inboundDate,
+            this.inboundDuration,
+            this.inspectorName,
+            this.inboundStatus});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+                        //
+            // mesReceiptNo
+            //
+            this.mesReceiptNo.Caption = "鏉$爜";
+            this.mesReceiptNo.FieldName = "barcode";
+            this.mesReceiptNo.MinWidth = 30;
+            this.mesReceiptNo.Name = "barcode";
+            this.mesReceiptNo.Tag = "barcode";
+            this.mesReceiptNo.Visible = true;
+            this.mesReceiptNo.VisibleIndex = 0;
+            this.mesReceiptNo.Width = 120;
+                        // erpReceiptNo
+            //
+            this.erpReceiptNo.Caption = "宸ュ崟鐘舵��";
+            this.erpReceiptNo.FieldName = "workorderStatus";
+            this.erpReceiptNo.MinWidth = 30;
+            this.erpReceiptNo.Name = "workorderStatus";
+            this.erpReceiptNo.Tag = "workorderStatus";
+            this.erpReceiptNo.Visible = true;
+            this.erpReceiptNo.VisibleIndex = 1;
+            this.erpReceiptNo.Width = 120;
+                        // inspectionNo
+            //
+            this.inspectionNo.Caption = "宸ュ崟鍗曞彿";
+            this.inspectionNo.FieldName = "workorderNo";
+            this.inspectionNo.MinWidth = 30;
+            this.inspectionNo.Name = "workorderNo";
+            this.inspectionNo.Tag = "workorderNo";
+            this.inspectionNo.Visible = true;
+            this.inspectionNo.VisibleIndex = 2;
+            this.inspectionNo.Width = 120;
+                        // purchaseOrderNo
+            //
+            this.purchaseOrderNo.Caption = "鏉$爜鏁伴噺";
+            this.purchaseOrderNo.FieldName = "barcodeQuantity";
+            this.purchaseOrderNo.MinWidth = 30;
+            this.purchaseOrderNo.Name = "barcodeQuantity";
+            this.purchaseOrderNo.Tag = "barcodeQuantity";
+            this.purchaseOrderNo.Visible = true;
+            this.purchaseOrderNo.VisibleIndex = 3;
+            this.purchaseOrderNo.Width = 120;
+                        // itemCode
+            //
+            this.itemCode.Caption = "鎶ュ伐鏍囪瘑";
+            this.itemCode.FieldName = "workReportFlag";
+            this.itemCode.MinWidth = 30;
+            this.itemCode.Name = "workReportFlag";
+            this.itemCode.Tag = "workReportFlag";
+            this.itemCode.Visible = true;
+            this.itemCode.VisibleIndex = 4;
+            this.itemCode.Width = 120;
+                        // itemName
+            //
+            this.itemName.Caption = "妫�楠屾爣璇�";
+            this.itemName.FieldName = "inspectionFlag";
+            this.itemName.MinWidth = 30;
+            this.itemName.Name = "inspectionFlag";
+            this.itemName.Tag = "inspectionFlag";
+            this.itemName.Visible = true;
+            this.itemName.VisibleIndex = 5;
+            this.itemName.Width = 150;
+                        // itemModel
+            //
+            this.itemModel.Caption = "妫�楠屽悎鏍兼爣璇�";
+            this.itemModel.FieldName = "inspectionPassFlag";
+            this.itemModel.MinWidth = 30;
+            this.itemModel.Name = "inspectionPassFlag";
+            this.itemModel.Tag = "inspectionPassFlag";
+            this.itemModel.Visible = true;
+            this.itemModel.VisibleIndex = 6;
+            this.itemModel.Width = 120;
+                        // supplierCode
+            //
+            this.supplierCode.Caption = "鍏ュ簱鏍囪瘑";
+            this.supplierCode.FieldName = "stockinFlag";
+            this.supplierCode.MinWidth = 30;
+            this.supplierCode.Name = "stockinFlag";
+            this.supplierCode.Tag = "stockinFlag";
+            this.supplierCode.Visible = true;
+            this.supplierCode.VisibleIndex = 7;
+            this.supplierCode.Width = 120;
+                        // supplierName
+            //
+            this.supplierName.Caption = "瓒呮椂1澶╂爣璇�";
+            this.supplierName.FieldName = "timeout1dayFlag";
+            this.supplierName.MinWidth = 30;
+            this.supplierName.Name = "timeout1dayFlag";
+            this.supplierName.Tag = "timeout1dayFlag";
+            this.supplierName.Visible = true;
+            this.supplierName.VisibleIndex = 8;
+            this.supplierName.Width = 150;
+                        // qualifiedQty
+            //
+            this.qualifiedQty.Caption = "瓒呮椂3澶╂爣璇�";
+            this.qualifiedQty.FieldName = "timeout3dayFlag";
+            this.qualifiedQty.MinWidth = 30;
+            this.qualifiedQty.Name = "timeout3dayFlag";
+            this.qualifiedQty.Tag = "timeout3dayFlag";
+            this.qualifiedQty.Visible = true;
+            this.qualifiedQty.VisibleIndex = 9;
+            this.qualifiedQty.Width = 100;
+                        // inboundQty
+            //
+            this.inboundQty.Caption = "浜у搧缂栫爜";
+            this.inboundQty.FieldName = "productCode";
+            this.inboundQty.MinWidth = 30;
+            this.inboundQty.Name = "productCode";
+            this.inboundQty.Tag = "productCode";
+            this.inboundQty.Visible = true;
+            this.inboundQty.VisibleIndex = 10;
+            this.inboundQty.Width = 100;
+                        // inboundDate
+            //
+            this.inboundDate.Caption = "浜у搧鍚嶇О";
+            this.inboundDate.FieldName = "productName";
+            this.inboundDate.MinWidth = 30;
+            this.inboundDate.Name = "productName";
+            this.inboundDate.Tag = "productName";
+            this.inboundDate.Visible = true;
+            this.inboundDate.VisibleIndex = 11;
+            this.inboundDate.Width = 120;
+                        // inboundDuration
+            //
+            this.inboundDuration.Caption = "瑙勬牸";
+            this.inboundDuration.FieldName = "specification";
+            this.inboundDuration.MinWidth = 30;
+            this.inboundDuration.Name = "specification";
+            this.inboundDuration.Tag = "specification";
+            this.inboundDuration.Visible = true;
+            this.inboundDuration.VisibleIndex = 12;
+            this.inboundDuration.Width = 120;
+                        // inspectorName
+            //
+            this.inspectorName.Caption = "鎵撳嵃鏃堕棿";
+            this.inspectorName.FieldName = "printTime";
+            this.inspectorName.MinWidth = 30;
+            this.inspectorName.Name = "printTime";
+            this.inspectorName.Tag = "printTime";
+            this.inspectorName.Visible = true;
+            this.inspectorName.VisibleIndex = 13;
+            this.inspectorName.Width = 100;
+                        // inboundStatus
+            //
+            this.inboundStatus.Caption = "棰勮寮�宸ユ棩";
+            this.inboundStatus.FieldName = "plannedStartDate";
+            this.inboundStatus.MinWidth = 30;
+            this.inboundStatus.Name = "plannedStartDate";
+            this.inboundStatus.Tag = "plannedStartDate";
+            this.inboundStatus.Visible = true;
+            this.inboundStatus.VisibleIndex = 14;
+            this.inboundStatus.Width = 100;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1});
+                        // YS_tmdrk
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "YS_tmdrk";
+            this.Text = "鍏ュ簱妫�鎶ヨ〃";
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraGrid.Columns.GridColumn mesReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn erpReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectionNo;
+        private DevExpress.XtraGrid.Columns.GridColumn purchaseOrderNo;
+        private DevExpress.XtraGrid.Columns.GridColumn itemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn itemName;
+        private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierCode;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierName;
+        private DevExpress.XtraGrid.Columns.GridColumn qualifiedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDate;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDuration;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectorName;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundStatus;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.cs
new file mode 100644
index 0000000..c6bbeba
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.cs
@@ -0,0 +1,156 @@
+using DevExpress.XtraTreeList.Data;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class YS_tmdrk : DevExpress.XtraEditors.XtraForm
+    {
+        //鍏ュ簱妫�鎶ヨ〃
+        string _webServiceName = "YS_rkjreport/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public YS_tmdrk()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+            {
+
+            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "print_time", "DESC", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageBarcodePendingStockReport", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    //barcode,                 -- 鏉$爜
+                    //workorder_status,        --宸ュ崟鐘舵��
+                    //workorder_no,            --宸ュ崟鍗曞彿
+                    //barcode_quantity,        --鏉$爜鏁伴噺
+                    //work_report_flag,        --鎶ュ伐鏍囪瘑
+                    //inspection_flag,         --妫�楠屾爣璇�
+                    //inspection_pass_flag,    --妫�楠屽悎鏍兼爣璇�
+                    //stockin_flag,            --鍏ュ簱鏍囪瘑
+                    //timeout_1day_flag,       --瓒呮椂1澶╂爣璇�
+                    //timeout_3day_flag,       --瓒呮椂3澶╂爣璇�
+                    //product_code,            --浜у搧缂栫爜
+                    //product_name,            --浜у搧鍚嶇О
+                    //specification,           --瑙勬牸
+                    //print_time,              --鎵撳嵃鏃堕棿
+                    //planned_start_date,      --棰勮寮�宸ユ棩
+                    //planned_completion_date, --棰勮瀹屽伐鏃�
+                    //actual_start_date,       --瀹為檯寮�宸ユ棩
+                    //pending_days,            --鏈叆搴撳ぉ鏁�
+                    //work_report_no,          --鎶ュ伐鍗曞彿
+                    //dispatch_no,             --娲惧伐鍗曞彿
+                    //inspection_task_no,      --妫�楠屼换鍔″崟鍙�
+                    //stockin_no-- 鍏ュ簱鍗曞彿
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.resx
new file mode 100644
index 0000000..a4826a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_tmdrk.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.Designer.cs
new file mode 100644
index 0000000..41d642b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.Designer.cs
@@ -0,0 +1,381 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+    partial class YS_zjhscjd
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.mesReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.erpReceiptNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectionNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.purchaseOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.supplierName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.qualifiedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundDuration = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inspectorName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.inboundStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = "鏌ヨ";
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.mesReceiptNo,
+            this.erpReceiptNo,
+            this.inspectionNo,
+            this.purchaseOrderNo,
+            this.itemCode,
+            this.itemName,
+            this.itemModel,
+            this.supplierCode,
+            this.supplierName,
+            this.qualifiedQty,
+            this.inboundQty,
+            this.inboundDate,
+            this.inboundDuration,
+            this.inspectorName,
+            this.inboundStatus});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+                                    // mesReceiptNo
+            //
+            this.mesReceiptNo.Caption = "鍛ㄦ棩鏈�";
+            this.mesReceiptNo.FieldName = "weekStartDate";
+            this.mesReceiptNo.MinWidth = 30;
+            this.mesReceiptNo.Name = "weekStartDate";
+            this.mesReceiptNo.Tag = "weekStartDate";
+            this.mesReceiptNo.Visible = true;
+            this.mesReceiptNo.VisibleIndex = 0;
+            this.mesReceiptNo.Width = 120;
+                        // erpReceiptNo
+            //
+            this.erpReceiptNo.Caption = "杞﹂棿鍚嶇О";
+            this.erpReceiptNo.FieldName = "workshopName";
+            this.erpReceiptNo.MinWidth = 30;
+            this.erpReceiptNo.Name = "workshopName";
+            this.erpReceiptNo.Tag = "workshopName";
+            this.erpReceiptNo.Visible = true;
+            this.erpReceiptNo.VisibleIndex = 1;
+            this.erpReceiptNo.Width = 120;
+                        // inspectionNo
+            //
+            this.inspectionNo.Caption = "宸ュ崟鍙�";
+            this.inspectionNo.FieldName = "workOrderNo";
+            this.inspectionNo.MinWidth = 30;
+            this.inspectionNo.Name = "workOrderNo";
+            this.inspectionNo.Tag = "workOrderNo";
+            this.inspectionNo.Visible = true;
+            this.inspectionNo.VisibleIndex = 2;
+            this.inspectionNo.Width = 120;
+                        // purchaseOrderNo
+            //
+            this.purchaseOrderNo.Caption = "宸ュ崟鐘舵��";
+            this.purchaseOrderNo.FieldName = "workOrderStatus";
+            this.purchaseOrderNo.MinWidth = 30;
+            this.purchaseOrderNo.Name = "workOrderStatus";
+            this.purchaseOrderNo.Tag = "workOrderStatus";
+            this.purchaseOrderNo.Visible = true;
+            this.purchaseOrderNo.VisibleIndex = 3;
+            this.purchaseOrderNo.Width = 120;
+                        // itemCode
+            //
+            this.itemCode.Caption = "鐗╂枡缂栫爜";
+            this.itemCode.FieldName = "materialCode";
+            this.itemCode.MinWidth = 30;
+            this.itemCode.Name = "materialCode";
+            this.itemCode.Tag = "materialCode";
+            this.itemCode.Visible = true;
+            this.itemCode.VisibleIndex = 4;
+            this.itemCode.Width = 120;
+                        // itemName
+            //
+            this.itemName.Caption = "鐗╂枡鍚嶇О";
+            this.itemName.FieldName = "materialName";
+            this.itemName.MinWidth = 30;
+            this.itemName.Name = "materialName";
+            this.itemName.Tag = "materialName";
+            this.itemName.Visible = true;
+            this.itemName.VisibleIndex = 5;
+            this.itemName.Width = 150;
+                        // itemModel
+            //
+            this.itemModel.Caption = "鐗╂枡瑙勬牸";
+            this.itemModel.FieldName = "materialSpec";
+            this.itemModel.MinWidth = 30;
+            this.itemModel.Name = "materialSpec";
+            this.itemModel.Tag = "materialSpec";
+            this.itemModel.Visible = true;
+            this.itemModel.VisibleIndex = 6;
+            this.itemModel.Width = 120;
+                        // supplierCode
+            //
+            this.supplierCode.Caption = "宸ュ崟鏁伴噺";
+            this.supplierCode.FieldName = "planQuantity";
+            this.supplierCode.MinWidth = 30;
+            this.supplierCode.Name = "planQuantity";
+            this.supplierCode.Tag = "planQuantity";
+            this.supplierCode.Visible = true;
+            this.supplierCode.VisibleIndex = 7;
+            this.supplierCode.Width = 120;
+                        // supplierName
+            //
+            this.supplierName.Caption = "榻愬鏍囪瘑";
+            this.supplierName.FieldName = "kitFlag";
+            this.supplierName.MinWidth = 30;
+            this.supplierName.Name = "kitFlag";
+            this.supplierName.Tag = "kitFlag";
+            this.supplierName.Visible = true;
+            this.supplierName.VisibleIndex = 8;
+            this.supplierName.Width = 150;
+                        // qualifiedQty
+            //
+            this.qualifiedQty.Caption = "鎶ュ伐鏁伴噺";
+            this.qualifiedQty.FieldName = "reportQuantity";
+            this.qualifiedQty.MinWidth = 30;
+            this.qualifiedQty.Name = "reportQuantity";
+            this.qualifiedQty.Tag = "reportQuantity";
+            this.qualifiedQty.Visible = true;
+            this.qualifiedQty.VisibleIndex = 9;
+            this.qualifiedQty.Width = 100;
+                        // inboundQty
+            //
+            this.inboundQty.Caption = "妫�楠屾暟閲�";
+            this.inboundQty.FieldName = "inspectionQuantity";
+            this.inboundQty.MinWidth = 30;
+            this.inboundQty.Name = "inspectionQuantity";
+            this.inboundQty.Tag = "inspectionQuantity";
+            this.inboundQty.Visible = true;
+            this.inboundQty.VisibleIndex = 10;
+            this.inboundQty.Width = 100;
+                        // inboundDate
+            //
+            this.inboundDate.Caption = "鍏ュ簱鏁伴噺";
+            this.inboundDate.FieldName = "storageQuantity";
+            this.inboundDate.MinWidth = 30;
+            this.inboundDate.Name = "storageQuantity";
+            this.inboundDate.Tag = "storageQuantity";
+            this.inboundDate.Visible = true;
+            this.inboundDate.VisibleIndex = 11;
+            this.inboundDate.Width = 120;
+                        // inboundDuration
+            //
+            this.inboundDuration.Caption = "鏉$爜寮犳暟";
+            this.inboundDuration.FieldName = "barcodeCount";
+            this.inboundDuration.MinWidth = 30;
+            this.inboundDuration.Name = "barcodeCount";
+            this.inboundDuration.Tag = "barcodeCount";
+            this.inboundDuration.Visible = true;
+            this.inboundDuration.VisibleIndex = 12;
+            this.inboundDuration.Width = 120;
+                        // inspectorName
+            //
+            this.inspectorName.Caption = "鏈姤宸ユ暟";
+            this.inspectorName.FieldName = "unreportedQuantity";
+            this.inspectorName.MinWidth = 30;
+            this.inspectorName.Name = "unreportedQuantity";
+            this.inspectorName.Tag = "unreportedQuantity";
+            this.inspectorName.Visible = true;
+            this.inspectorName.VisibleIndex = 13;
+            this.inspectorName.Width = 100;
+                        // inboundStatus
+            //
+            this.inboundStatus.Caption = "鏈楠屾暟";
+            this.inboundStatus.FieldName = "uninspectedQuantity";
+            this.inboundStatus.MinWidth = 30;
+            this.inboundStatus.Name = "uninspectedQuantity";
+            this.inboundStatus.Tag = "uninspectedQuantity";
+            this.inboundStatus.Visible = true;
+            this.inboundStatus.VisibleIndex = 14;
+            this.inboundStatus.Width = 100;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1});
+            // 
+            // YS_rkjreport
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "YS_rkjreport";
+            this.Text = "鍏ュ簱妫�鎶ヨ〃";
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraGrid.Columns.GridColumn mesReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn erpReceiptNo;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectionNo;
+        private DevExpress.XtraGrid.Columns.GridColumn purchaseOrderNo;
+        private DevExpress.XtraGrid.Columns.GridColumn itemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn itemName;
+        private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierCode;
+        private DevExpress.XtraGrid.Columns.GridColumn supplierName;
+        private DevExpress.XtraGrid.Columns.GridColumn qualifiedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundQty;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDate;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundDuration;
+        private DevExpress.XtraGrid.Columns.GridColumn inspectorName;
+        private DevExpress.XtraGrid.Columns.GridColumn inboundStatus;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.cs
new file mode 100644
index 0000000..15d7312
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.cs
@@ -0,0 +1,155 @@
+using DevExpress.XtraTreeList.Data;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static DevExpress.DataProcessing.InMemoryDataProcessor.AddSurrogateOperationAlgorithm;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class YS_zjhscjd : DevExpress.XtraEditors.XtraForm
+    {
+        //鍏ュ簱妫�鎶ヨ〃
+        string _webServiceName = "YS_rkjreport/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public YS_zjhscjd()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+            {
+
+            });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "week_start_date", "desc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageWeeklyProductionScheduleReport", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    //-- ======================================================================
+                    //--鑻辨枃鍒楀悕(English Column Name) | 涓枃鍒楀悕(Chinese Column Name) | 璇存槑(Description)
+                    //-- ======================================================================
+                    //--1.week_start_date | 鍛ㄦ棩鏈� | 宸ュ崟鐨勬帓浜ф棩鏈熸垨鎶ュ伐鏃ユ湡鎵�鍦ㄧ殑鍛�
+                    //-- 2.workshop_name | 杞﹂棿鍚嶇О | 鐢熶骇杞﹂棿鍚嶇О
+                    //-- 3.work_order_no | 宸ュ崟鍙� | 鐢熶骇宸ュ崟缂栧彿
+                    //-- 4.work_order_status | 宸ュ崟鐘舵�� | 宸ュ崟褰撳墠鐘舵�侊紙鏂板缓 / 宸叉帓浜� / 鐢熶骇涓� / 宸插畬宸� / 宸插叧闂級
+                    //--5.material_code | 鐗╂枡缂栫爜 | 鐢熶骇鐗╂枡鐨勭紪鐮�
+                    //-- 6.material_name | 鐗╂枡鍚嶇О | 鐢熶骇鐗╂枡鐨勫悕绉�
+                    //-- 7.material_spec | 鐗╂枡瑙勬牸 | 鐢熶骇鐗╂枡鐨勮鏍�
+                    //-- 8.plan_quantity | 宸ュ崟鏁伴噺 | 宸ュ崟璁″垝鐢熶骇鏁伴噺
+                    //-- 9.kit_flag | 榻愬鏍囪瘑 | 鐗╂枡鏄惁榻愬锛堟槸 / 鍚︼級
+                    //--10.report_quantity | 鎶ュ伐鏁伴噺 | 宸叉姤宸ユ暟閲�
+                    //-- 11.inspection_quantity | 妫�楠屾暟閲� | 宸叉楠屾暟閲�
+                    //-- 12.storage_quantity | 鍏ュ簱鏁伴噺 | 宸插叆搴撴暟閲�
+                    //-- 13.barcode_count | 鏉$爜寮犳暟 | 宸叉墦鍗扮殑鏉$爜鏁伴噺
+                    //-- 14.unreported_quantity | 鏈姤宸ユ暟 | 宸ュ崟鏁伴噺 - 鎶ュ伐鏁伴噺
+                    //-- 15.uninspected_quantity | 鏈楠屾暟 | 鎶ュ伐鏁伴噺 - 妫�楠屾暟閲�
+                    //-- 16.unstored_quantity | 鏈叆搴撴暟 | 妫�楠屾暟閲� - 鍏ュ簱鏁伴噺
+                    //-- 17.manual_complete_flag | 鎵嬪姩瀹屽伐鏍囪瘑 | 鏄惁鎵嬪姩鏍囪涓哄畬宸ワ紙鏄� / 鍚︼級
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.resx
new file mode 100644
index 0000000..a4826a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_zjhscjd.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file

--
Gitblit v1.9.3