bug

lu

6 小时以前 b0046e84b9f95ce07dbbd117758da848ede67546

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

@@ -1,4 +1,6 @@
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -23,7 +25,7 @@
            this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            //  this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -34,11 +36,16 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
            this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
            txt_daa015.getSuppler("");
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -67,24 +74,55 @@
            };
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {

                string rowGuid, rowName;
                (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                    lbGuid, txt_daa001, gridView1);
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "托板码");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = "rpt_daa{"
                        + "100"
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
            };
            //这是追溯码
            this.ucBtnPrint98.btnPrintClick += (s, e) =>
            {
                _print98();
            };
            //这是后盖码
            this.ucBtnPrint100.btnPrintClick += (s, e) =>
            {
                _print100();
            };
            this.ucBtnPrint100.btnAllClick += (s, e) =>
            this.ucBtnPrint98.btnAllClick += (s, e) =>
            {
                string rowGuid, rowName;
                (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                    lbGuid, txt_daa001, gridView1);
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "后盖码");
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "追溯码");
                string strCodeList = "";
                frm.UpdateParent += (ss, ee) =>
                {
@@ -95,7 +133,7 @@
                    return;
                try
                {
                    string rptParameter = "rpt_hgm{"
                    string rptParameter = "rpt_trace{"
                    + "100"
                    + "," + ""
                    + "," + ""
@@ -114,7 +152,54 @@
                    MsgHelper.ShowError(ex.Message);
                }
            };
            //这是后盖码
            this.ucBtnPrint100.btnPrintClick += (s, e) =>
            {
                _print100();
            };
            this.ucBtnPrint100.btnAllClick += (s, e) =>
            {
                string rowGuid, rowName;
                (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                    lbGuid, txt_daa001, gridView1);
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "后盖码");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction.StartsWith("print"))
                {
                    string printParm = strAction.Replace("print", "");
                    try
                    {
                        string rptParameter = printParm + "{"
                        + "100"
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
            };
            //这是齐套标识卡，仅仅打印
            this.ucBtnPrint101.SetPlButton(false);
            this.ucBtnPrint101.btnPrintClick += (s, e) =>
            {
                _print101();
@@ -139,16 +224,26 @@
                              "XlsInOut/" + strService,
                              JsonConvert.SerializeObject(_obj));
                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        if (_rtn.rtnCode > 0)
                            MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        else
                            MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.Warning("提示：" + ex.Message);
                        MsgHelper.ShowError("提示：" + ex.Message);
                    }
                };
                frm.ShowDialog();
            };

            this.btnDesign.Click += (s, e) =>
            {
                EasyRptEdtShow frm = new EasyRptEdtShow();
                frm.UpdateParent += (ss, ee) =>
                {
                };
                frm.ShowDialog();
            };
        }

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -191,7 +286,26 @@
            _filterList = e.FilterList;
            getPageList(1);
        }

        /// <summary>
        /// 工序变更
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnGxClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var frm = new ShowGx(rowGuid);
            frm.ShowDialog();
        }
        /// <summary>
        /// 删除工单
        /// </summary>
@@ -204,7 +318,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
@@ -222,17 +336,19 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -248,7 +364,7 @@
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定重新生成首检吗？"))
@@ -264,25 +380,16 @@
                    _webServiceName + "EditModelSubmitShouJian",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    //if (xtraTabControl1.SelectedTabPageIndex == 1)
                    //{
                    //    getModel(lbGuid.Text.Trim());
                    //}
                    //else
                    //{
                    //    //注意，这里和其它页面有点不一样
                    //    getPageList(this.pageBar1.CurrentPage);
                    //    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                    //    gridView1.FocusedRowHandle = rowHandle;
                    //}
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -370,7 +477,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -381,8 +488,8 @@
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                gvList.Add(gvMx2);
                //gvList.Add(gvMx1);
                //gvList.Add(gvMx2);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
        }
@@ -394,36 +501,39 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            //toolBarMenu1.isSetBtn = false;
            //var _obj = new
            //{
            //    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
            //    sjxt = txt_sjXt.GetId(), //实际线体
            //    bz = txt_daa009.Text.Trim()//备注
            //};
            //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;
            //        List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            //        gvList.Add(gvMx1);
            //        UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
            //        toolBarMenu1.currentAction = "";
            //        txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
            //        txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
            //        toolBarMenu1.currentAction = "";
            //        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
            //    }
            //}
            //catch (Exception ex)
            //{
            //    ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            //}
            toolBarMenu1.isSetBtn = false;
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                sjxt = txt_daa015.GetId(), //线体
                sclx = txt_daa025.Text.Trim(),//生产类型
                bz = txt_daa009.Text.Trim()//备注
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    //gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    //toolBarMenu1.currentAction = "";
                    //txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
                    //txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
                    //toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
@@ -475,12 +585,12 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -494,9 +604,6 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    //string cjId = dy.daa013;
                    //string xjxt = dy.sjXt;
                    // txt_sjXt.getSuppler(cjId, xjxt);
                    //托板码
                    txt_zQty.Text = dy.daa008;
                    txt_yQty.Text = dy.yQty;
@@ -614,14 +721,69 @@
                        }
                    }

                    //2025-7-20加上产线确认记录
                    JArray array6 = new JArray();
                    foreach (var a in _job["rtnData"]["list6"])
                    {
                        array6.Add(a);
                    }
                    DataTable dt6 = JsonConvert.DeserializeObject<DataTable>(array6.ToString());
                    if (dt6.Rows.Count > 0)
                    {
                        gcMx6.BindingContext = new BindingContext();
                        gcMx6.DataSource = dt6;
                        gcMx6.ForceInitialize();
                        gvMx6.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx6);
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx6, gvMx6);
                    }
                    JArray array7 = new JArray();
                    foreach (var a in _job["rtnData"]["list7"])
                    {
                        array7.Add(a);
                    }
                    DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString());
                    if (dt7.Rows.Count > 0)
                    {
                        gcMx7.BindingContext = new BindingContext();
                        gcMx7.DataSource = dt7;
                        gcMx7.ForceInitialize();
                        gvMx7.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7);
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7);
                    }
                    JArray array8 = new JArray();
                    foreach (var a in _job["rtnData"]["list8"])
                    {
                        array8.Add(a);
                    }
                    DataTable dt8 = JsonConvert.DeserializeObject<DataTable>(array8.ToString());
                    if (dt8.Rows.Count > 0)
                    {
                        gcMx8.BindingContext = new BindingContext();
                        gcMx8.DataSource = dt8;
                        gcMx8.ForceInitialize();
                        gvMx8.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx8);
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
                    }
                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -661,14 +823,15 @@
                case 9:
                    strMsg = "手动完工";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -685,9 +848,10 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());

                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -700,10 +864,12 @@
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -832,49 +998,6 @@
                   + "," + ""
                   + "," + ""
                   + "}";
        }

        /// <summary>
        /// 重打
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {

            MsgHelper.ShowInformation("功能开发中！");
            return;
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                var _obj = new
                {
                    mxGuid = mxGuid,
                    inType = "daa"
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                         "VArrivalBarcodeManager/DeleteBarcode",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            }
        }
        #endregion
    }