1

lu

2024-12-17 002774519ddd99881ded07ab99fb44c011d090d7

1

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs

@@ -838,6 +838,7 @@
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -935,7 +936,6 @@
            this.xtraTabPage2.Controls.Add(this.tabMx);
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
           
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
@@ -1039,6 +1039,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesInvItemOut_SCLL";
            this.Text = "生产领料单";
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs

@@ -1130,7 +1130,6 @@
            this.xtraTabPage2.Controls.Add(this.tabMx);
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
           
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
@@ -1297,6 +1296,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesItemQt";
            this.Text = "其它出库申请";
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtCk.Designer.cs

@@ -1132,7 +1132,6 @@
                this.xtraTabPage2.Controls.Add(this.tabMx);
                this.xtraTabPage2.Controls.Add(this.panel1);
                this.xtraTabPage2.Name = "xtraTabPage2";
               
                this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
                this.xtraTabPage2.Text = "数据详细";
                // 
@@ -1290,7 +1289,7 @@
                this.picCheckBox.TabStop = false;
                this.picCheckBox.Visible = false;
                // 
                // Frm_MesItemQt
            // Frm_MesItemQtCk
                // 
                this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
                this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -1298,7 +1297,8 @@
                this.Controls.Add(this.picCheckBox);
                this.Controls.Add(this.xtraTabControl1);
                this.Controls.Add(this.toolBarMenu1);
                this.Name = "Frm_MesItemQt";
            this.Name = "Frm_MesItemQtCk";
            this.Text = "其它出库单";
                this.tabMxPage1.ResumeLayout(false);
                ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
                ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtCk.cs

@@ -19,16 +19,12 @@
{
    public partial class Frm_MesItemQtCk : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesItemQtManager/";
        string _webServiceName = "MesItemQtCkManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Frm_MesItemQtCk()
        {
            InitializeComponent();
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
@@ -122,44 +118,6 @@
        {
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
        }

        /// <summary>
        /// 删除事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            List<dynamic> lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                        getPageList(this.pageBar1.CurrentPage);
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 刷新事件
        /// </summary>
@@ -181,131 +139,6 @@
                getPageList(1);
            }
        }
        /// <summary>
        /// 修改事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
        }
        /// <summary>
        /// 新增事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            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>
        /// 保存事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            string inCusId = txt_qt018.GetId();
            string inCkId = txt_qt008.GetId();
            string inLlrId = txt_qt022.GetId();
            string inDepart = txt_qt009.GetId();
            string inScgdId = txt_qt006.Text.Trim();
            if (string.IsNullOrEmpty(inCusId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择客户！");
                txt_qt018.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inCkId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择仓库！");
                txt_qt008.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLlrId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择领料人！");
                txt_qt022.Focus();
                return;
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                inRklb = txt_qt003.Text.Trim(),//业务类别
                inYwlx = txt_qt004.Text.Trim(),//业务类型
                inRkfs = txt_qt019.Text.Trim(),//入库方式
                inRklx = txt_qt020.Text.Trim(),//入库类型
                inCusId = inCusId,//客户
                inCkId = inCkId,//仓库
                inDepart = inDepart,//申请部门
                inXsdh = txt_qt021.Text.Trim(),//销售单号
                inScgdId = inScgdId,//生产工单号
                inLlrId = inLlrId,//领料人
                inRkyy = txt_qt010.Text.Trim(),//原因
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
                MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
                return;
            }
            for (var i = 0; i < gvMx1.DataRowCount; i++)
            {
                var row = gvMx1.GetDataRow(i);
                if (row != null)
                {
                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    //string _msl = row["quantity"].ToString();
                    //if (string.IsNullOrEmpty(_msl))
                    //{
                    //    MsgHelper.ShowError("数量不能为空！");
                    //    return;
                    //}
                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        ItemId = (row["itemId"].ToString()),
                        Sqsl = (row["qd007"].ToString()),
                        Bz = (row["qd010"].ToString()),
                    });
                }
            }
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs

@@ -24,7 +24,6 @@
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
@@ -79,47 +78,6 @@
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        ///     删除事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1, "roleName");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }

            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？\n该操作将会清空相应的用户权限"))
                return;
            var lst = new List<string>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                var strJson = UtilityHelper.HttpPost("", "Role/DeleteModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                        getPageList(this.pageBar1.CurrentPage);
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>

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

@@ -183,13 +183,13 @@
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 250;
            this.gv_ruleFormat.MinWidth = 300;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 1;
            this.gv_ruleFormat.Width = 250;
            this.gv_ruleFormat.Width = 300;
            // 
            // gv_docCode
            // 

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs

@@ -231,13 +231,13 @@
            this.gv_pageView.AppearanceCell.Options.UseFont = true;
            this.gv_pageView.Caption = "页面名";
            this.gv_pageView.FieldName = "pageView";
            this.gv_pageView.MinWidth = 80;
            this.gv_pageView.MinWidth = 120;
            this.gv_pageView.Name = "gv_pageView";
            this.gv_pageView.OptionsColumn.AllowEdit = false;
            this.gv_pageView.Tag = "query_a.PAGE_VIEW";
            this.gv_pageView.Visible = true;
            this.gv_pageView.VisibleIndex = 0;
            this.gv_pageView.Width = 94;
            this.gv_pageView.Width = 120;
            // 
            // toolBarMenu1
            // 

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1357,7 +1357,6 @@
                    }
                }
            }

            return "";
        }