From ec02022018c44e794fa53e40daa96321daaae4fc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 六月 2025 15:21:30 +0800
Subject: [PATCH] 清理
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 61 +++++++++---------------------
1 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 135bc1c..99ef870 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -29,16 +29,15 @@
/// </summary>
/// <param name="_fGx">宸ュ簭</param>
/// <param name="_fBc">鐝</param>
- public Frm_Work01(string _fGx, string _fBc)
+ /// <param name="_strinOther">鐩墠涓虹數妫�璺緞</param>
+ public Frm_Work01(string _fGx, string _fBc, string _strinOther)
{
InitializeComponent();
txt_gx.Text = _fGx;
txt_bc.Text = _fBc;
- this.Text = "宸ュ簭閲囬泦 - " + _fGx + " - " + _fBc;
- if (!getConfig())
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇诲彇閰嶇疆鏂囦欢澶辫触锛岃鑱旂郴绠＄悊鍛橈紒");
- }
+ txt_dianJianPath.Text = _strinOther;
+ dianJianPath= _strinOther;
+ this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
addColumn();
txt_barCode.KeyDown += (s, e) =>
{
@@ -50,7 +49,7 @@
};
btnBad.Click += (s, e) =>
{
- UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰'");
+ UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -75,39 +74,11 @@
}
/// <summary>
- /// 鍏堣鍙栭厤缃�
+ /// 鏍规嵁宸ュ簭锛屾瀯閫犱笉鍚岀被鍨嬬殑瀹炰綋
/// </summary>
- /// <returns></returns>
- private bool getConfig()
- {
- string _where = " and 1=1 and defect_code='7001'";
- 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();
- return true;
- }
- return false;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return false;
- }
- }
-
- /// <summary>
- /// 璇诲彇瀹炰綋
- /// </summary>
- /// <param name="_barCode"></param>
- /// <param name="_checkResult"></param>
- /// <param name="_badReson"></param>
+ /// <param name="_barCode">鏉＄爜</param>
+ /// <param name="_checkResult">缁撴灉</param>
+ /// <param name="_badReson">鍘熷洜</param>
/// <returns></returns>
private dynamic getObj(string _barCode, string _checkResult, string _badReson = "")
{
@@ -140,7 +111,7 @@
{
return null;
}
- File.WriteAllText(dianJianPath, "");
+
JArray dsTemp = JArray.Parse(myStr);
foreach (var ss in dsTemp) //鏌ユ壘鏌愪釜瀛楁涓庡��
{
@@ -150,7 +121,7 @@
JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
- JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
+ JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ",");
JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
@@ -167,6 +138,7 @@
_obj.t009 = JNV;
_obj.t010 = XLV;
_obj.t011 = GVV;
+ // File.WriteAllText(dianJianPath, "");
return _obj;
}
@@ -193,7 +165,12 @@
_obj.t009 = strSw4;
_obj.t010 = strCsl5;
_obj.t011 = strSw5;
- // _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
+ // _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
+ return _obj;
+ }
+
+ if (txt_gx.Text.Trim() == fGxZhongJian)
+ {
return _obj;
}
return null;
--
Gitblit v1.9.3