Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

2025-11-01 cbb5315301b1490b57497212256c5255e5eb7eb6

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -32,6 +32,7 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
            toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -120,6 +121,10 @@
                                _row["itemId"] = dym.itemId;
                                _row["shNum"] = dym.sl;
                                _row["remark"] = dym.bz;
                                //默认仓库和仓库数量
                                _row["dcCk"] = dym.depotName;
                                _row["dcCkGuid"] = dym.depotId;
                                _row["kcQty"] = dym.kcQty;
                                if (!string.IsNullOrEmpty(_orgId))
                                {
                                    _row["dcOrg"] = _orgName;
@@ -154,7 +159,44 @@
                }
            };
            #endregion

            #region 2025-10-10 向下复制beg
            btnDown.Click += (s, e) =>
            {
                // 获取当前选中行的行号
                int focusedRowHandle = gvMx1.FocusedRowHandle;
                if (focusedRowHandle < 0) return;

                // 获取当前行的时长
                DataRow currentRow = gvMx1.GetDataRow(focusedRowHandle);
                if (currentRow == null) return;
                var hourValue = currentRow["drCkGuid"];
                var hourValue2 = currentRow["drCk"];
                if (hourValue == null || string.IsNullOrEmpty(hourValue.ToString())) {
                    MsgHelper.ShowError("当前选中的行无仓库，复制失败！");
                    return;
                }
                if (hourValue2 == null) {
                    MsgHelper.ShowError("当前选中的行无仓库，复制失败！");
                    return;
                }
                // 批量设置下面所有行的时长
                for (int i = focusedRowHandle + 1; i < gvMx1.DataRowCount; i++)
                {
                    var row = gvMx1.GetDataRow(i);
                    if (row != null)
                    {
                        row["drCkGuid"] = hourValue;
                        row["drCk"] = hourValue2;
                    }
                }
                gvMx1.RefreshData();
            };
            #endregion
        }

      

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -582,7 +624,16 @@
            }
        }


        /// <summary>
        /// 完结
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
        {
            _toolCk(2);
        }
        /// <summary>
        ///     审核事件
        /// </summary>
@@ -639,6 +690,9 @@
                case 0:
                    strMsg = "反审核";
                    break;
                case 2:
                    strMsg = "完结";
                    break;
                case 20:
                    strMsg = "售后审核";
                    break;
@@ -676,8 +730,8 @@
                        getModel(lbGuid.Text.Trim());
                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                        if (_inFieldValue <= 1) 
                        UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                        if (_inFieldValue <= 1)
                            UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                    }
                    else
                    {
@@ -711,6 +765,9 @@
            gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
            gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
            gvMx1.SetFocusedRowCellValue("dcCk", SelectedDataRow["depotName"]);
            gvMx1.SetFocusedRowCellValue("dcCkGuid", SelectedDataRow["depotId"]);
            gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
@@ -755,7 +812,7 @@
                        getModel(lbGuid.Text);
                    }
                    else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {