工单排产

lu

2024-12-30 f295cd95416fa3a141ecf4203fab9dc698cc70e4

工单排产

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -337,9 +337,9 @@
            dataTable.Rows.Add("CGDH(到货单)");//V
            dataTable.Rows.Add("CGJY(检验单)");//V
            dataTable.Rows.Add("DBSQ(调拨申请单)");//V
            dataTable.Rows.Add("GDPC(工单排产)");//V
            dataTable.Rows.Add("TL(退料单)");
            dataTable.Rows.Add("IN(入库单)");
            dataTable.Rows.Add("PB(批量排产)");
            dataTable.Rows.Add("SC(生产工单)");
            dataTable.Rows.Add("OUT(出库单)");
            dataTable.Rows.Add("HB(物料合并)");

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

@@ -1211,6 +1211,7 @@
            this.gridColumn5.FieldName = "jabzChk";
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "query_a.jabzChk";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 50;

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

@@ -191,6 +191,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_daa022 = new DevExpress.XtraEditors.TextEdit();
            this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
            this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
@@ -210,7 +211,6 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -2190,6 +2190,7 @@
            this.gridColumn5.MaxWidth = 50;
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "query_a.jabs";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            this.gridColumn5.Width = 50;
@@ -2400,6 +2401,15 @@
            this.panel1.Size = new System.Drawing.Size(1126, 231);
            this.panel1.TabIndex = 1;
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(669, 184);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(214, 36);
            this.ucBtnPrint1.TabIndex = 463;
            // 
            // txt_daa022
            // 
            this.txt_daa022.Enabled = false;
@@ -2580,15 +2590,6 @@
            this.picCheckBox.TabIndex = 6;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(669, 184);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(214, 36);
            this.ucBtnPrint1.TabIndex = 463;
            // 
            // Frm_Womdaa
            // 

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

@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
            this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -109,6 +109,8 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.txt_erpSczz = new Gs.DevApp.UserControl.UcLookOrg();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
@@ -600,7 +602,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
            this.tabMxPage1.Text = "任务单明细";
            // 
            // gcMx1
@@ -615,7 +617,7 @@
            this.repositoryItemButtonEdit1,
            this.rptJYBZ,
            this.repositoryItemDateEdit3});
            this.gcMx1.Size = new System.Drawing.Size(1124, 417);
            this.gcMx1.Size = new System.Drawing.Size(1124, 389);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -695,10 +697,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -707,7 +709,7 @@
            // 
            this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkUser.Appearance.Options.UseFont = true;
            this.lb_checkUser.Location = new System.Drawing.Point(541, 87);
            this.lb_checkUser.Location = new System.Drawing.Point(540, 50);
            this.lb_checkUser.Name = "lb_checkUser";
            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
            this.lb_checkUser.TabIndex = 273;
@@ -716,7 +718,7 @@
            // txt_checkUser
            // 
            this.txt_checkUser.Enabled = false;
            this.txt_checkUser.Location = new System.Drawing.Point(600, 83);
            this.txt_checkUser.Location = new System.Drawing.Point(600, 46);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -741,7 +743,7 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(523, 53);
            this.lb_checkDate.Location = new System.Drawing.Point(523, 18);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
            this.lb_checkDate.TabIndex = 267;
@@ -750,7 +752,7 @@
            // txt_checkDate
            // 
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(600, 49);
            this.txt_checkDate.Location = new System.Drawing.Point(600, 14);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -775,7 +777,7 @@
            // 
            this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fstatus.Appearance.Options.UseFont = true;
            this.lb_fstatus.Location = new System.Drawing.Point(540, 22);
            this.lb_fstatus.Location = new System.Drawing.Point(540, 82);
            this.lb_fstatus.Name = "lb_fstatus";
            this.lb_fstatus.Size = new System.Drawing.Size(56, 21);
            this.lb_fstatus.TabIndex = 262;
@@ -800,7 +802,7 @@
            // 
            this.lb_pba013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pba013.Appearance.Options.UseFont = true;
            this.lb_pba013.Location = new System.Drawing.Point(20, 22);
            this.lb_pba013.Location = new System.Drawing.Point(20, 50);
            this.lb_pba013.Name = "lb_pba013";
            this.lb_pba013.Size = new System.Drawing.Size(68, 21);
            this.lb_pba013.TabIndex = 258;
@@ -810,7 +812,7 @@
            // 
            this.lb_pba009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pba009.Appearance.Options.UseFont = true;
            this.lb_pba009.Location = new System.Drawing.Point(49, 53);
            this.lb_pba009.Location = new System.Drawing.Point(49, 82);
            this.lb_pba009.Name = "lb_pba009";
            this.lb_pba009.Size = new System.Drawing.Size(39, 21);
            this.lb_pba009.TabIndex = 240;
@@ -818,7 +820,7 @@
            // 
            // txt_pba009
            // 
            this.txt_pba009.Location = new System.Drawing.Point(100, 49);
            this.txt_pba009.Location = new System.Drawing.Point(100, 78);
            this.txt_pba009.Name = "txt_pba009";
            this.txt_pba009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pba009.Properties.Appearance.Options.UseFont = true;
@@ -981,10 +983,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 121);
            this.tabMx.Location = new System.Drawing.Point(0, 149);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 449);
            this.tabMx.Size = new System.Drawing.Size(1126, 421);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -992,6 +994,8 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_erpSczz);
            this.panel1.Controls.Add(this.txt_pba013);
            this.panel1.Controls.Add(this.txt_hNo);
            this.panel1.Controls.Add(this.labelControl1);
@@ -1011,13 +1015,13 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 121);
            this.panel1.Size = new System.Drawing.Size(1126, 149);
            this.panel1.TabIndex = 1;
            // 
            // txt_pba013
            // 
            this.txt_pba013.IsReadly = false;
            this.txt_pba013.Location = new System.Drawing.Point(100, 18);
            this.txt_pba013.Location = new System.Drawing.Point(100, 46);
            this.txt_pba013.Name = "txt_pba013";
            this.txt_pba013.Size = new System.Drawing.Size(180, 28);
            this.txt_pba013.TabIndex = 459;
@@ -1025,7 +1029,7 @@
            // txt_hNo
            // 
            this.txt_hNo.Enabled = false;
            this.txt_hNo.Location = new System.Drawing.Point(360, 18);
            this.txt_hNo.Location = new System.Drawing.Point(360, 14);
            this.txt_hNo.Name = "txt_hNo";
            this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_hNo.Properties.Appearance.Options.UseFont = true;
@@ -1036,7 +1040,7 @@
            // 
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(286, 22);
            this.labelControl1.Location = new System.Drawing.Point(286, 18);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 457;
@@ -1045,7 +1049,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(49, 83);
            this.btnSelect.Location = new System.Drawing.Point(49, 114);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(128, 29);
            this.btnSelect.TabIndex = 456;
@@ -1054,7 +1058,7 @@
            // txt_fstatus
            // 
            this.txt_fstatus.Enabled = false;
            this.txt_fstatus.Location = new System.Drawing.Point(600, 20);
            this.txt_fstatus.Location = new System.Drawing.Point(600, 80);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "";
            this.txt_fstatus.Size = new System.Drawing.Size(94, 24);
@@ -1062,7 +1066,7 @@
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(827, 70);
            this.labelControl11.Location = new System.Drawing.Point(885, 18);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1073,7 +1077,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(878, 70);
            this.lbGuid.Location = new System.Drawing.Point(936, 18);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
@@ -1089,6 +1093,24 @@
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // txt_erpSczz
            // 
            this.txt_erpSczz.IsReadly = false;
            this.txt_erpSczz.Location = new System.Drawing.Point(100, 14);
            this.txt_erpSczz.Name = "txt_erpSczz";
            this.txt_erpSczz.Size = new System.Drawing.Size(180, 28);
            this.txt_erpSczz.TabIndex = 460;
            // 
            // labelControl2
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(20, 18);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 461;
            this.labelControl2.Text = "生产组织";
            // 
            // Frm_Wompba
            // 
@@ -1210,5 +1232,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
        private UserControl.UcLookOrg txt_erpSczz;
        private DevExpress.XtraEditors.LabelControl labelControl2;
    }
}

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

@@ -43,12 +43,15 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_erpSczz.EditChanged += (s, e) => {
                txt_pba013.getSuppler(txt_erpSczz.GetId());
            };
            txt_pba013.EditChanged += (s, e) =>
            {
                string workGuid = this.txt_pba013.GetGuid();
                string workGuid = this.txt_pba013.GetId();
                _getListJybz(workGuid);
            };
            //选择需要入库的明细
            //选择需要的明细
            btnSelect.Click += (s, e) =>
            {
                if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
@@ -56,7 +59,7 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择车间，才能选择任务单！");
                    return;
                }
                var frm = new SelectWompba(this.txt_pba013.Text);
                var frm = new SelectWompba(this.txt_pba013.GetId());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -88,13 +91,13 @@
                frm.ShowDialog();
            };
        }
        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
           Task.Delay(100);
            Task.Delay(100);
            getPageList(1);
        }
      

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -134,7 +137,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private   void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk(1, "EditModelSubmit");
        }
@@ -145,7 +148,7 @@
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private   void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk(0, "EditModelSubmitFSH");
        }
@@ -239,9 +242,16 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gvMx1);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
            }
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
            }
        }
        /// <summary>
        /// 新增事件
@@ -252,8 +262,11 @@
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);

        }
        /// <summary>
        /// 保存事件
@@ -378,7 +391,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private   void getPageList(int curPage)
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
@@ -414,12 +427,13 @@
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
            

        }
        private void getModel(string strGuid)
        {
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") {
            if (toolBarMenu1.currentAction == "add")
            {
                Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                return;
            };
@@ -517,22 +531,17 @@
        /// <param name="workGuid"></param>
        private void _getListJybz(string workGuid)
        {
            rptJYBZ.Items.Clear();
            if (string.IsNullOrEmpty(workGuid))
                return;
            var _obj = new
            {
                guid = workGuid //主建
            };
            var json = JsonConvert.SerializeObject(_obj);
            var _sbSqlWhere = " and 1=1 and dpt_id="+ workGuid;
            var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    "SysDepartmentManager/GetModel", json);
                var _job = JObject.Parse(strReturn);
                var array = new JArray();
                var d = _job["rtnData"]["list"];
                foreach (var a in d) array.Add(a);
                var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                var strReturn = UtilityHelper.HttpPost("", "MesWorkshopLineManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                foreach (DataRow dr in dt.Rows)
                {
                    rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
@@ -561,12 +570,11 @@
            }
        }


        /// <summary>
        /// 工具条事件
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(int _inFieldValue,string _mth)
        private void _toolCk(int _inFieldValue, string _mth)
        {
            string strMsg = "";
            switch (_inFieldValue)

 DevApp/Gs.DevApp/UserControl/SelectWompba.cs

@@ -1,14 +1,7 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
@@ -18,10 +11,11 @@
        private readonly List<FilterEntity> _filterList =
           new List<FilterEntity>();
        private readonly string _webServiceName = "WompbaManager/";
        private string lineId = "";
        public SelectWompba(string _lineId)
        private string workId = "";
        public SelectWompba(string _workId)
        {
            InitializeComponent();
            this.workId = _workId;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.IndicatorWidth = 50;
@@ -76,8 +70,7 @@
                everyPageSize = pageSize,
                sortName = "",
                keyWhere = "",
                inBusType = "CG",
                lineId = this.lineId
                workId = this.workId
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
@@ -93,7 +86,6 @@
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
               
            }
            catch (Exception ex)
            {

 DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs

@@ -22,7 +22,7 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
          //  getSuppler();
        }

        public bool IsReadly { get; set; }
@@ -38,9 +38,9 @@
            if (EditChanged != null) EditChanged(this, e);
        }

        private void getSuppler()
        public void getSuppler(string orgId="")
        {
            var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1");
            var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1 and a.FSubsidiary=" + orgId);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {