初始化标准版

lg

2025-11-20 fbe33a615f1c4e798a0f8e58163e68c3ce789614

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

@@ -1,4 +1,7 @@
using DevExpress.Utils;
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;
@@ -6,7 +9,10 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -19,11 +25,13 @@
        public Frm_Womdaa()
        {
            InitializeComponent();
            //先隐藏4种打印
            //  txt_mesStartProd.CustomFormat = "yyyy-MM-dd HH:mm";
            this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            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 +42,19 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
            this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
            this.toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
            this.toolBarMenu1.getXmlConfig();
            gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
            gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
            Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
            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);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -52,6 +68,8 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;

            #region 托板码打印相关
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
@@ -60,7 +78,6 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
            //这是托板码
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                _print();
@@ -72,13 +89,17 @@
                    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{"
@@ -99,8 +120,14 @@
                {
                    MsgHelper.ShowError(ex.Message);
                }
                }
            };
            //这是追溯码
            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
            {
                _print();
            };
            #endregion
            #region 追溯码打印相关
            this.ucBtnPrint98.btnPrintClick += (s, e) =>
            {
                _print98();
@@ -112,13 +139,17 @@
                    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_trace{"
@@ -139,8 +170,15 @@
                {
                    MsgHelper.ShowError(ex.Message);
                }
                }
            };
            //这是后盖码
            this.ucBtnPrint98.btnZhiJieClick += (s, e) =>
            {
                _print98();
            };
            #endregion

            #region 后盖码打印相关
            this.ucBtnPrint100.btnPrintClick += (s, e) =>
            {
                _print100();
@@ -152,16 +190,21 @@
                    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 = "rpt_hgm{"
                        string rptParameter = printParm + "{"
                    + "100"
                    + "," + ""
                    + "," + ""
@@ -179,12 +222,25 @@
                {
                    MsgHelper.ShowError(ex.Message);
                }
                }
            };
            //这是齐套标识卡，仅仅打印
            this.ucBtnPrint100.btnZhiJieClick += (s, e) =>
            {
                _print100();
            };
            #endregion

            #region 这是齐套标识卡，仅仅打印
            this.ucBtnPrint101.SetPlButton(false);
            this.ucBtnPrint101.btnPrintClick += (s, e) =>
            {
                _print101();
            };
            this.ucBtnPrint101.btnZhiJieClick += (s, e) =>
            {
                _print101();
            };
            #endregion
            //导入模板
            this.btnIn.Click += (s, e) =>
            {
@@ -197,7 +253,7 @@
                    var _obj = new
                    {
                        tmpGuid = upGuid,
                        strType = "",
                        strType = txt_daa001.Text.Trim(),
                    };
                    try
                    {
@@ -205,17 +261,85 @@
                              "XlsInOut/" + strService,
                              JsonConvert.SerializeObject(_obj));
                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                        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();
            };
            //导出备料单身
            btnXls.Click += (s, e) =>
            {
                if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
                {
                    MsgHelper.ShowError("请先选择你导出的工单！");
                    return;
        }
                if (!MsgHelper.AskQuestion("你选择了【" + txt_daa001.Text.Trim() + "】，确定导出吗？"))
                    return;
                using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
                {
                    folderBrowserDialog.Description = "选择导出文件的保存路径";
                    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                    if (dialogResult == DialogResult.OK)
                    {
                        string _folder = folderBrowserDialog.SelectedPath;
                        var _params = new
                        {
                            inQueryWhere = lbGuid.Text.Trim(),//主建
                            inFid = "",
                            inP1 = "",
                            inP2 = "",
                            inP3 = "",
                            inP4 = ""
                        };
                        var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaaMx", "", "", "", _params);
                        try
                        {
                            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
                            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                            if (_rtn.rtnCode > 0)
                            {
                                string _file = _rtn.rtnData.fileUrl.ToString();
                                string _folderName = _folder + "\\" + _file.Replace("down/", "");
                                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                                using (WebClient client = new WebClient())
                                {
                                    client.DownloadFile(_url, _folderName);
                                }
                                var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
                                frm.ShowDialog();
                            }
                            else
                            {
                                ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                            }
                        }
                        catch (Exception ex)
                        {
                            ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                        }
                    }
                }

            };
        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -257,7 +381,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>
@@ -270,7 +413,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
@@ -288,17 +431,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>
@@ -314,7 +459,7 @@
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定重新生成首检吗？"))
@@ -330,25 +475,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);
            }
        }

@@ -436,7 +572,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);
@@ -447,8 +583,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);
            }
        }
@@ -460,36 +596,124 @@
        /// <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>();
            toolBarMenu1.isSetBtn = false;
            DateTime _dtKg = txt_mesStartProd.DateTime;
            DateTime _dtWg = txt_mesEndProd.DateTime;
            if (string.IsNullOrEmpty(txt_mesStartProd.Text.Trim()))
            {
                ToolBox.MsgHelper.ShowError("提示：预计开工时间不能为空！");
                txt_mesStartProd.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_mesEndProd.Text.Trim()))
            {
                ToolBox.MsgHelper.ShowError("提示：预计完工时间不能为空！");
                txt_mesEndProd.Focus();
                return;
            }
            if (_dtWg < _dtKg)
            {
                ToolBox.MsgHelper.ShowError("提示：完工时间不能小于开工时间！");
                return;
            }
            if (string.IsNullOrEmpty(txt_daa015.GetId()))
            {
                ToolBox.MsgHelper.ShowError("提示：线体不能为空！");
                return;
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                sjxt = txt_daa015.GetId(), //线体
                sclx = txt_daa025.Text.Trim(),//生产类型
                bz = txt_daa009.Text.Trim(),//备注
                dtKg = _dtKg.ToString("yyyy-MM-dd HH:mm:ss"),
                dtWg = _dtWg.ToString("yyyy-MM-dd HH:mm:ss"),
            };
            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);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
            //        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);
            //}
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    toolBarMenu1.currentAction = "";
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 工单导出
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
        {
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ERP_SCZZ in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                if (dialogResult == DialogResult.OK)
                {
                    string _folder = folderBrowserDialog.SelectedPath;
                    var _params = new
                    {
                        inQueryWhere = _sbSqlWhere.ToString(),
                        inFid = "",
                        inP1 = "",
                        inP2 = "",
                        inP3 = "",
                        inP4 = ""
                    };
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaa", "", "", "", _params);
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                        if (_rtn.rtnCode > 0)
                        {
                            string _file = _rtn.rtnData.fileUrl.ToString();
                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                            using (WebClient client = new WebClient())
                            {
                                client.DownloadFile(_url, _folderName);
                            }
                            var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
                            frm.ShowDialog();
                        }
                        else
                        {
                            ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                        }
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                    }
                }
            }
        }

        /// <summary>
@@ -499,7 +723,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ERP_SCZZ in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -541,12 +769,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
@@ -560,9 +788,8 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    //string cjId = dy.daa013;
                    //string xjxt = dy.sjXt;
                    // txt_sjXt.getSuppler(cjId, xjxt);
                    string lineId = dy.daa013;
                    txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
                    //托板码
                    txt_zQty.Text = dy.daa008;
                    txt_yQty.Text = dy.yQty;
@@ -575,7 +802,6 @@
                    txt_zQty100.Text = dy.daa008;
                    txt_yQty100.Text = dy.yQty100;
                    txt_kQty100.Text = dy.kQty100;

                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
@@ -679,15 +905,72 @@
                            continue;
                        }
                    }

                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                    //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
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    {
                        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 = "";
                    txt_iCount_98.Text = txt_kQty98.Text;//追溯码
                    txt_iCount_100.Text = txt_kQty100.Text;//后盖码

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

@@ -727,14 +1010,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 + "吗？"))
@@ -751,9 +1035,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());
@@ -766,10 +1051,12 @@
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -899,7 +1186,47 @@
                   + "," + ""
                   + "}";
        }
      
        #endregion

        /// <summary>
        /// 变更内包装数量
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            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 frm = new Frm_WomdaaNbz(mxGuid);
                frm.ShowDialog();
            }
        }
        /// <summary>
        /// 进入看板
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            if (e.Button.Index == 0)
            {
                var userGuid =
               string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
                   ? Guid.NewGuid().ToString()
                   : LoginInfoModel.CurrentUser.LoginUserGuid;
                var rowhandle = gridView1.FocusedRowHandle;
                var dr = gridView1.GetDataRow(rowhandle);
                var qcGuid = dr["guid"].ToString() + "&mth=" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "&userGuid=" + userGuid;
                KanBanLaTouH5 frm = new KanBanLaTouH5(qcGuid);
                frm.ShowDialog();
            }
        }
    }
}