From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 08:04:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
index 0310c5e..863ce17 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -3,15 +3,21 @@
using Newtonsoft.Json;
using System;
using System.Data;
+using System.IO;
namespace Gs.DevApp.DevFrm.Work
{
public partial class Frm_WorkStart : DevExpress.XtraEditors.XtraForm
{
+ /// <summary>
+ /// pc鍙渶瑕佽繃绔�
+ /// </summary>
+ private string isPc = "鎶曞叆,鐢垫,姘存,缁堟";
+ //鐢垫鍙栧�艰矾寰�
+ string dianJianPath = "";
public Frm_WorkStart()
{
InitializeComponent();
-
_getListJyxm();
btnLogin.Click += BtnLogin_Click;
}
@@ -32,10 +38,55 @@
}
string fGx = txt_gx.Text.Trim();
string fBc = txt_bc.Text.Trim();
- Frm_Work01 frm = new Frm_Work01(fGx, fBc);
+ //濡傛灉鏄數妫�
+ if (fGx == "G002:鐢垫")
+ {
+ if (!getConfigDianJian())
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇诲彇銆怗002:鐢垫銆戠疆鏂囦欢澶辫触锛岃鑱旂郴绠＄悊鍛橈紒");
+ return;
+ }
+ }
+
+ Frm_Work01 frm = new Frm_Work01(fGx, fBc,dianJianPath);
frm.ShowDialog();
}
+ /// <summary>
+ /// 鍏堣鍙栫數妫�閰嶇疆
+ /// </summary>
+ /// <returns></returns>
+ private bool getConfigDianJian()
+ {
+ //杩欐槸鐢垫鏁版嵁鐨勮矾寰�
+ string _where = " and 1=1 and defect_code='1008'";
+ var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ dianJianPath = dt.Rows[0]["defectName"].ToString();
+ if (File.Exists(dianJianPath))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ return false;
+ }
+ }
/// <summary>
/// 璇诲彇宸ュ簭涓嬫媺
@@ -52,7 +103,8 @@
txt_gx.Properties.Items.Add("-璇烽�夋嫨-");
foreach (DataRow dr in dt.Rows)
{
- txt_gx.Properties.Items.Add(dr["processNo"].ToString() + ":" + dr["processName"].ToString());
+ if (isPc.Contains(dr["processName"].ToString()))
+ txt_gx.Properties.Items.Add(dr["processNo"].ToString() + ":" + dr["processName"].ToString());
}
txt_gx.Focus();
txt_gx.SelectedIndex = 0;
--
Gitblit v1.9.3