计件工资bug调整

cdk

2025-08-12 1f53a2d8bc69e3725e7b923a99429d5e241504c4

计件工资bug调整

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs

@@ -48,7 +48,6 @@
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumnIndex = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -261,7 +260,6 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 61;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumnIndex,
            this.gv_createBy,
            this.gv_createDate,
            this.gridColumn6,
@@ -279,13 +277,6 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumnIndex
            // 
            this.gridColumnIndex.Caption = "序号";
            this.gridColumnIndex.FieldName = "rowNo";
            this.gridColumnIndex.Name = "gridColumnIndex";
            this.gridColumnIndex.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
            // 
            // gv_createBy
            // 
@@ -964,7 +955,6 @@
            // gridView2
            // 
            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumnIndex,
            this.gridColumn16,
            this.gridColumn9,
            this.gridColumn10,
@@ -979,6 +969,7 @@
            this.gridView2.GridControl = this.gridControl1;
            this.gridView2.Name = "gridView2";
            this.gridView2.OptionsView.ShowGroupPanel = false;
            this.gridView2.IndicatorWidth = 60;
            // 
            // gridColumn16
            // 
@@ -988,7 +979,7 @@
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.OptionsColumn.ReadOnly = true;
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 1;
            this.gridColumn16.VisibleIndex = 0;
            this.gridColumn16.Width = 112;
            // 
            // gridColumn9
@@ -999,7 +990,7 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 2;
            this.gridColumn9.VisibleIndex = 1;
            this.gridColumn9.Width = 112;
            // 
            // gridColumn10
@@ -1010,7 +1001,7 @@
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.OptionsColumn.ReadOnly = true;
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 3;
            this.gridColumn10.VisibleIndex = 2;
            this.gridColumn10.Width = 112;
            // 
            // gridColumn11
@@ -1021,7 +1012,7 @@
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Tag = "edit";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 4;
            this.gridColumn11.VisibleIndex = 3;
            this.gridColumn11.Width = 112;
            // 
            // gridColumn12
@@ -1033,7 +1024,7 @@
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Tag = "edit";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 5;
            this.gridColumn12.VisibleIndex = 4;
            this.gridColumn12.Width = 112;
            // 
            // repositoryItemSearchLookUpEdit1
@@ -1060,7 +1051,7 @@
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.OptionsColumn.ReadOnly = true;
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 6;
            this.gridColumn13.VisibleIndex = 5;
            this.gridColumn13.Width = 112;
            // 
            // gridColumn14
@@ -1072,7 +1063,7 @@
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Tag = "";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 7;
            this.gridColumn14.VisibleIndex = 6;
            this.gridColumn14.Width = 112;
            // 
            // gridColumn15
@@ -1083,7 +1074,7 @@
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Tag = "edit";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 8;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 112;
            // 
            // gridColumn18
@@ -1109,7 +1100,7 @@
            this.gvMxDel.MinWidth = 30;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 9;
            this.gvMxDel.VisibleIndex = 8;
            this.gvMxDel.Width = 112;
            // 
            // repositoryItemButtonEdit1
@@ -1285,6 +1276,5 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraEditors.SimpleButton btnFZ;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumnIndex;
    }
}

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs

@@ -28,6 +28,14 @@
        public Frm_MESJJERRORJS()
        {
            InitializeComponent();

            // 添加序号显示（使用行指示器）
            gridView2.IndicatorWidth = 60;
            gridView2.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
            gridView2.CellValueChanged += gridView2_CellValueChanged;
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -39,7 +47,6 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            btnFZ.Click += btnFZ_Click;
            gridView2.CustomUnboundColumnData += gridView2_CustomUnboundColumnData;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
@@ -671,8 +678,20 @@
            {
                txt_HourlyType.EditValue = SelectedDataRow["计时类型"].ToString();
                txt_HourlySalary.EditValue = SelectedDataRow["计时单价"];

                var hourlySalary = decimal.Parse(txt_HourlySalary.EditValue.ToString());
                for (int i = 0; i < gridView2.DataRowCount; i++)
                {
                    DataRow row = gridView2.GetDataRow(i);
                    decimal hour = 0;
                    decimal.TryParse(row["hour"]?.ToString(), out hour);
                    if (row != null)
                    {
                        row["salary"] = hourlySalary * hour;
                    }
                }
                gridView2.RefreshData();
            }
            
        }

        private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
@@ -717,14 +736,6 @@
                    // 计算计时工资
                    row["salary"] = hourlySalary * hour;
                }
            }
        }

        private void gridView2_CustomUnboundColumnData(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDataEventArgs e)
        {
            if (e.Column.FieldName == "rowNo" && e.IsGetData)
            {
                e.Value = e.ListSourceRowIndex + 1;
            }
        }


 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs

@@ -44,7 +44,11 @@
            this.toolBarMenu1.btnLianBanClick += ToolBarMenu1_btnLianBanClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView3);
            this.toolBarMenu1.getXmlConfig();
            
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);