From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 16:56:35 +0800
Subject: [PATCH] 现场修理
---
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
index 7c95a9f..573ac46 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -21,16 +22,10 @@
{
InitializeComponent();
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
- lookSearchSupplier.EditValueChanged +=
- LookSearchSupplier_EditValueChanged;
+ lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
}
public bool IsReadly { get; set; }
- private string _KeyFile = "";
- public string KeyFile
- {
- get { return _KeyFile; }
- set { _KeyFile = value; }
- }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -41,29 +36,31 @@
{
if (EditChanged != null) EditChanged(this, e);
}
-
- public void getSuppler(string shopGuid)
+ /// <summary>
+ /// 璇诲彇绾夸綋
+ /// </summary>
+ /// <param name="shopGuid"></param>
+ public void getSuppler(string shopGuid, string _dftVale = "")
{
- var _obj = new
- {
- guid = shopGuid //涓诲缓
- };
- var json = JsonConvert.SerializeObject(_obj);
+ lookSearchSupplier.EditValue = null;
+ if (string.IsNullOrEmpty(shopGuid))
+ return;
+ var _sbSqlWhere = " and a.dpt_id="+ shopGuid;
+ var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,c.departmentcode asc,a.line_no",
+ "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn = UtilityHelper.HttpPost("",
- "MesWorkshopManager/GetModel", json);
- var _job = JObject.Parse(strReturn);
- var array = new JArray();
- var d = _job["rtnData"]["list"];
- foreach (var a in d) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ "MesWorkshopLineManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = dd.rtnData.list;
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "name";
- // lookSearchSupplier.Properties.ValueMember = "suppNo";
- lookSearchSupplier.Properties.ValueMember = KeyFile;
+ lookSearchSupplier.Properties.ValueMember = "id";
+ lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ if (!string.IsNullOrEmpty(_dftVale))
+ SetIdOrCode(_dftVale);
}
catch (Exception ex)
{
@@ -76,7 +73,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["guid"].ToString();
+ string id = row["id"].ToString();
return id;
}
return "";
@@ -104,7 +101,8 @@
lookSearchSupplier.EditValue = null;
return;
}
- lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
+ if (!string.IsNullOrEmpty(Code))
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3