From d1e80353c3e56f944c386340e82bdfcd3e1b7f00 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期一, 01 十二月 2025 09:07:09 +0800
Subject: [PATCH] 更新工单退料排序

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs |  184 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 142 insertions(+), 42 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index de2d3c8..3ffa58e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -36,6 +36,9 @@
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
             toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
+            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -86,8 +89,8 @@
                 {
                     try
                     {
-                        var lst = new List<string>();
-                        lst = ee.StringList;
+                        var lst = new List<dynamic>();
+                        lst = ee.DynamicList;
                         var _obj = lst;
                         var strReturn = UtilityHelper.HttpPost("",
                             "MesItemTblManager/SelectPbaToView",
@@ -102,6 +105,7 @@
                         }
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = _oldTable;
+                        gvMx1.Columns["tld016"].SortOrder = DevExpress.Data.ColumnSortOrder.Ascending;
                         gcMx1.ForceInitialize();
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                         gvMx1.CloseEditor();
@@ -116,40 +120,11 @@
                 };
                 frm.ShowDialog();
             };
-            //鎵撳嵃浜嬩欢
+            #region 鎵撳嵃鐩稿叧
+            //棰勮鎵撳嵃浜嬩欢
             this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
-                string rowGuid = lbMxGuid.Text.Trim();
-                ucBtnPrint1.guidKey = rowGuid;
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
-                    txt_iCount_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                    txt_psnQty_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (lbMxGuid.Text.Trim().Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                this.ucBtnPrint1.rptParameter = "rpt_SCTL{"
-                       + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
-                       + "," + ""
-                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
-                       + "," + txt_iCount_1.Text.Trim()//寮犳暟
-                       + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺
-                       + "}";
-                txt_iCount_1.Text = "";
-                txt_psnQty_1.Text = "";
+                _print(0);
             };
             //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
             this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -190,6 +165,11 @@
                     }
                 }
             };
+            //鐩存帴鎵撳嵃浜嬩欢
+            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+            {
+                _print(1);
+            };
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
             //鎵撳嵃鑷姩璁$畻
             txt_psnQty_1.TextChanged += (s, e) =>
@@ -200,8 +180,89 @@
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
             };
+            //鍏ㄩ儴鎵撳嵃
+            ucBtnPrintAll1.btnPrintClick += (s, e) =>
+            {
+                this.ucBtnPrintAll1.rptType = "";
+                this.ucBtnPrintAll1.mxList = null;
+                if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
+                {
+                    MsgHelper.ShowError("鎻愮ず锛氭墦鍗板墠璇峰厛淇濆瓨鍗曟嵁锛�");
+                    return;
+                }
+                getModel(lbGuid.Text.Trim());
+                List<dynamic> lst = new List<dynamic>();
+                DataTable dt = (DataTable)gcMx1.DataSource;
+                foreach (DataRow row in dt.Rows)
+                {
+                    string guid = row["tlid"].ToString();
+                    string psnQty = row["kdy"].ToString();
+                    if (string.IsNullOrEmpty(psnQty))
+                    {
+                        continue;
+                    }
+                    if (psnQty == "0")
+                    {
+                        continue;
+                    }
+                    lst.Add(new
+                    {
+                        guid = guid,
+                        kdy = psnQty,
+                    });
+                }
+                if (lst.Count <= 0)
+                {
+                    MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐨勭墿鏂欙紒");
+                    return;
+                }
+                this.ucBtnPrintAll1.rptType = "rpt_SCTL";
+                this.ucBtnPrintAll1.mxList = lst;
+            };
+            #endregion
+
         }
- 
+
+
+
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+        private void _print(int type)
+        {
+            string rowGuid = lbMxGuid.Text.Trim();
+            ucBtnPrint1.guidKey = rowGuid;
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
+                txt_iCount_1.Focus();
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
+                txt_psnQty_1.Focus();
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            if (lbMxGuid.Text.Trim().Length < 10)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            this.ucBtnPrint1.rptParameter = "rpt_SCTL{"
+                   + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+                   + "," + ""
+                   + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+                   + "," + txt_iCount_1.Text.Trim()//寮犳暟
+                   + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺
+                   + "}";
+            txt_iCount_1.Text = "";
+            txt_psnQty_1.Text = "";
+        }
         private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -230,6 +291,32 @@
         {
             getPageList(curPage);
         }
+
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1, "billNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_SCTLSQ{"
+                                               + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+        }
         /// <summary>
         /// 鏌ヨ浜嬩欢
         /// </summary>
@@ -254,7 +341,16 @@
             _filterList = e.FilterList;
             getPageList(1);
         }
-
+        /// <summary>
+        /// 瀹岀粨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+        {
+            _toolCk(199);
+        }
         /// <summary>
         /// 鎵瑰噯
         /// </summary>
@@ -292,7 +388,7 @@
         {
             _toolCk(5);
         }
-       
+
         /// <summary>
         ///     瀹℃牳浜嬩欢
         /// </summary>
@@ -468,7 +564,7 @@
                 txt_tbl005.Focus();
                 return;
             }
-            if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
+            if ((txt_tbl005.Text.Trim() == "鑹搧閫�鏂�") && txt_chkOut.Checked)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
                 txt_tbl005.Focus();
@@ -522,7 +618,8 @@
                         AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                         Sl = _sl, //鐢宠鏁伴噺
                         Remark = _tld014,
-                        Bllb = row["tld015"].ToString().Replace("|", ",")
+                        Bllb = row["tld015"].ToString().Replace("|", ","),
+                        tld016 = row["tld016"].ToString()
                     });
                 }
             }
@@ -714,7 +811,7 @@
                         getModel(lbGuid.Text);
                     }
                     else
-                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
@@ -750,6 +847,9 @@
                 case 5:
                     strMsg = "鍝佽川鍙嶅鏍�";
                     break;
+                case 199:
+                    strMsg = "瀹岀粨";
+                    break;
             }
             ;
             toolBarMenu1.guidKey = "";
@@ -766,7 +866,7 @@
             {
                 guid = rowGuid,
                 inFieldValue = _inFieldValue,
-             
+
             };
             try
             {
@@ -806,7 +906,7 @@
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
-            UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", "  a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
+            UcDictionarySelect frm = new UcDictionarySelect("閫�鏂欑被鍒�", "  a.s_type='鐢熶骇閫�鏂欑被鍒�' and a.pid<>'00000000-0000-0000-0000-000000000000'");
             frm.UpdateParent += (ss, ee) =>
             {
                 System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();

--
Gitblit v1.9.3