lu
2024-12-23 0db6a12e75681672d45ed97846d7a88d6622a465
委外
已修改2个文件
74 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -37,7 +37,6 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WwPc));
            this.gvMx1rwdGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1pcGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1scheduleOrder = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
            this.gvMx1mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -72,7 +71,6 @@
            this.lb_hNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_hNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -134,20 +132,6 @@
            this.gvMx1pcGuid.OptionsColumn.AllowEdit = false;
            this.gvMx1pcGuid.Tag = "query_a.pcGuid";
            this.gvMx1pcGuid.Width = 94;
            //
            // gvMx1scheduleOrder
            //
            this.gvMx1scheduleOrder.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1scheduleOrder.AppearanceCell.Options.UseFont = true;
            this.gvMx1scheduleOrder.Caption = "序号 ";
            this.gvMx1scheduleOrder.FieldName = "scheduleOrder";
            this.gvMx1scheduleOrder.MinWidth = 50;
            this.gvMx1scheduleOrder.Name = "gvMx1scheduleOrder";
            this.gvMx1scheduleOrder.OptionsColumn.AllowEdit = false;
            this.gvMx1scheduleOrder.Tag = "query_a.schedule_order";
            this.gvMx1scheduleOrder.Visible = true;
            this.gvMx1scheduleOrder.VisibleIndex = 9;
            this.gvMx1scheduleOrder.Width = 94;
            // 
            // gvMx1mesEndProd
            // 
@@ -366,7 +350,6 @@
            this.gvMx1mesStartProd,
            this.gvMx1mesEndProd,
            this.gvMxRemark,
            this.gvMx1scheduleOrder,
            this.gvMx1pcGuid,
            this.gvMx1rwdGuid,
            this.gvMxDel});
@@ -397,7 +380,7 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 10;
            this.gvMxDel.VisibleIndex = 9;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
@@ -422,7 +405,7 @@
            this.gv_departId.OptionsColumn.AllowEdit = false;
            this.gv_departId.Tag = "query_a.depart_id";
            this.gv_departId.Visible = true;
            this.gv_departId.VisibleIndex = 8;
            this.gv_departId.VisibleIndex = 7;
            this.gv_departId.Width = 94;
            // 
            // gv_wwDd
@@ -436,7 +419,7 @@
            this.gv_wwDd.OptionsColumn.AllowEdit = false;
            this.gv_wwDd.Tag = "query_a.ww_dd";
            this.gv_wwDd.Visible = true;
            this.gv_wwDd.VisibleIndex = 7;
            this.gv_wwDd.VisibleIndex = 6;
            this.gv_wwDd.Width = 94;
            // 
            // lb_shState
@@ -454,14 +437,15 @@
            this.gv_shState.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_shState.AppearanceCell.Options.UseFont = true;
            this.gv_shState.Caption = "审核状态 ";
            this.gv_shState.FieldName = "shState";
            this.gv_shState.FieldName = "shChk";
            this.gv_shState.MaxWidth = 50;
            this.gv_shState.MinWidth = 50;
            this.gv_shState.Name = "gv_shState";
            this.gv_shState.OptionsColumn.AllowEdit = false;
            this.gv_shState.Tag = "query_a.sh_state";
            this.gv_shState.Visible = true;
            this.gv_shState.VisibleIndex = 6;
            this.gv_shState.Width = 94;
            this.gv_shState.VisibleIndex = 0;
            this.gv_shState.Width = 50;
            // 
            // lb_shTime
            // 
@@ -489,13 +473,13 @@
            this.gv_shTime.AppearanceCell.Options.UseFont = true;
            this.gv_shTime.Caption = "审核时间 ";
            this.gv_shTime.FieldName = "shTime";
            this.gv_shTime.MinWidth = 50;
            this.gv_shTime.MinWidth = 180;
            this.gv_shTime.Name = "gv_shTime";
            this.gv_shTime.OptionsColumn.AllowEdit = false;
            this.gv_shTime.Tag = "query_a.sh_time";
            this.gv_shTime.Visible = true;
            this.gv_shTime.VisibleIndex = 5;
            this.gv_shTime.Width = 94;
            this.gv_shTime.Width = 180;
            // 
            // lb_shBy
            // 
@@ -523,13 +507,13 @@
            this.gv_shBy.AppearanceCell.Options.UseFont = true;
            this.gv_shBy.Caption = "审核人 ";
            this.gv_shBy.FieldName = "shBy";
            this.gv_shBy.MinWidth = 50;
            this.gv_shBy.MinWidth = 100;
            this.gv_shBy.Name = "gv_shBy";
            this.gv_shBy.OptionsColumn.AllowEdit = false;
            this.gv_shBy.Tag = "query_a.sh_by";
            this.gv_shBy.Visible = true;
            this.gv_shBy.VisibleIndex = 4;
            this.gv_shBy.Width = 94;
            this.gv_shBy.Width = 100;
            // 
            // gv_createBy
            // 
@@ -537,13 +521,13 @@
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "创建人 ";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.MinWidth = 100;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 3;
            this.gv_createBy.Width = 94;
            this.gv_createBy.Width = 100;
            // 
            // gv_createTime
            // 
@@ -551,13 +535,13 @@
            this.gv_createTime.AppearanceCell.Options.UseFont = true;
            this.gv_createTime.Caption = "创建时间 ";
            this.gv_createTime.FieldName = "createTime";
            this.gv_createTime.MinWidth = 50;
            this.gv_createTime.MinWidth = 180;
            this.gv_createTime.Name = "gv_createTime";
            this.gv_createTime.OptionsColumn.AllowEdit = false;
            this.gv_createTime.Tag = "query_a.create_time";
            this.gv_createTime.Visible = true;
            this.gv_createTime.VisibleIndex = 2;
            this.gv_createTime.Width = 94;
            this.gv_createTime.Width = 180;
            // 
            // lb_hNo
            // 
@@ -585,27 +569,13 @@
            this.gv_hNo.AppearanceCell.Options.UseFont = true;
            this.gv_hNo.Caption = "排产编号 ";
            this.gv_hNo.FieldName = "hNo";
            this.gv_hNo.MinWidth = 50;
            this.gv_hNo.MinWidth = 100;
            this.gv_hNo.Name = "gv_hNo";
            this.gv_hNo.OptionsColumn.AllowEdit = false;
            this.gv_hNo.Tag = "query_a.hNo";
            this.gv_hNo.Visible = true;
            this.gv_hNo.VisibleIndex = 1;
            this.gv_hNo.Width = 94;
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "id ";
            this.gv_id.FieldName = "guid";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            this.gv_hNo.Width = 100;
            // 
            // toolBarMenu1
            // 
@@ -636,16 +606,18 @@
            // 
            // gridView1
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_id,
            this.gv_shState,
            this.gv_hNo,
            this.gv_createTime,
            this.gv_createBy,
            this.gv_shBy,
            this.gv_shTime,
            this.gv_shState,
            this.gv_wwDd,
            this.gv_departId});
            this.gridView1.GridControl = this.gcMain;
@@ -827,7 +799,6 @@
        //BQCreateConrolObejct
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1rwdGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1scheduleOrder;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesEndProd;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesStartProd;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
@@ -861,7 +832,6 @@
        private DevExpress.XtraEditors.LabelControl lb_hNo;
        private DevExpress.XtraEditors.TextEdit txt_hNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_hNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.CheckEdit txt_shState;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -480,7 +480,7 @@
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                var mxGuid = dr["id"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))