From 90c199edf9c98a66f0ba3f42577bff797073fce1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 13 四月 2025 17:11:12 +0800
Subject: [PATCH] 打印按钮自动计算,选择窗体取消分页

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

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index b1c51d0..a01faa2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -233,6 +234,7 @@
             string _txt_fzrId = txt_fzrId.GetId();
             string _txt_workNo = txt_workNo.Text.Trim();
             string _txt_msg = txt_msg.TextTxt;
+            string _txt_zrType=txt_zrType.Text.Trim();
             if (txt_freceQty.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
@@ -248,6 +250,20 @@
                     txt_fngHandle.Focus();
                     return;
                 }
+                if (_txt_fzrId.Length<= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐d换浜猴紒");
+                    txt_fzrId.Focus();
+                    return;
+                }
+
+                if (txt_zrType.SelectedIndex <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐d换鍒ゅ畾锛�");
+                    txt_zrType.Focus();
+                    return;
+                }
+
                 //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
                 if (txt_fngHandle.SelectedIndex == 1)
                 {
@@ -264,12 +280,26 @@
                         return;
                     }
                 }
+                else {
+                    if (!string.IsNullOrEmpty(_txt_workNo))
+                    {
+                        Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸~鍐欏弽宸ュ崟鍙凤紒");
+                        txt_workNo.Focus();
+                        return;
+                    }
+                    if (!string.IsNullOrEmpty(_txt_fmrmode))
+                    {
+                        Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕侀�夋嫨鍙嶅伐宸ュ簭锛�");
+                        txt_fmrmode.Focus();
+                        return;
+                    }
+                }
             }
             //褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
             else {
-                if ((_txt_fngHandle.Length + _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0)
+                if (( _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0  || txt_zrType.SelectedIndex>0 || txt_fngHandle.SelectedIndex > 0)
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒锛�");
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒");
                     txt_freceQty.Focus();
                     return;
                 }
@@ -284,6 +314,7 @@
                 workNo = _txt_workNo,
                 fmrmode = _txt_fmrmode,
                 msg = _txt_msg,
+                zrType= _txt_zrType,
                 edtType = 1
             };
             try

--
Gitblit v1.9.3