From 5e376d06404a16cb3c82a93cff351c5315bbcfe3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 28 六月 2025 16:10:22 +0800
Subject: [PATCH] 客户多打印

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 34b2b3e..98e34cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -1,4 +1,5 @@
 锘�
+using Gs.DevApp.DevFrm.QC;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -82,6 +83,22 @@
                 frm.ShowDialog();
             };
             _getListJyxm();
+            //澶嶅埗
+            btnCopy.Click += (s, e) =>
+            {
+                if ((lbGuid.Text.Trim().Length < 10))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+                    return;
+                }
+                if ((txt_isCheck.Checked == false))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+                    return;
+                }
+                Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim());
+                frm.ShowDialog();
+            };
         }
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -156,7 +173,7 @@
         private void getPageList(int curPage)
         {
             gcMain1.DataSource = null;
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
@@ -224,6 +241,7 @@
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gvList.Add(gvMx1);
             UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+            this.btnCopy.Enabled = true;
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -249,6 +267,7 @@
                 Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
                 txt_fBegDate.Focus(); return;
             }
+            txt_fEndDate.DateTime= new DateTime(2099, 1, 1);
             if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
@@ -275,6 +294,12 @@
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑閲嶉噺涓嬮檺锛�");
                 txt_fMinWeight.Focus(); return;
+            }
+            //涓婇檺涓嶈兘浣庝簬涓嬮檺
+            if (decimal.Parse(txt_fMaxWeight.Text.Trim()) < decimal.Parse(txt_fMinWeight.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("涓婇檺涓嶈兘浣庝簬涓嬮檺锛�");
+                txt_fMaxWeight.Focus(); return;
             }
             var _obj = new
             {
@@ -321,7 +346,7 @@
                     gvList.Add(gvMx1);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
-                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                    //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -347,6 +372,11 @@
             getModel(rowGuid);
 
         }
+
+        /// <summary>
+        /// 璇诲彇瀹炰綋
+        /// </summary>
+        /// <param name="strGuid"></param>
         private void getModel(string strGuid)
         {
             bool isEdit = false;
@@ -374,6 +404,7 @@
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    this.btnCopy.Enabled = true;
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])

--
Gitblit v1.9.3