From f515bb49e76481c378c23267cd1a919d25249c30 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 13:32:24 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs | 18 ++++++--
DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs | 9 +++-
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs | 34 +++++++++++-----
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs | 20 ++++-----
DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs | 2
5 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
index 41b2e0a..cdb579b 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
@@ -107,6 +107,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn();
this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.鍒嗗尯Guid = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -228,7 +229,8 @@
this.colCreateBy,
this.createTime,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.鍒嗗尯Guid});
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
@@ -244,10 +246,11 @@
//
// gridColumn5
//
- this.gridColumn5.Caption = "缂栧彿";
+ this.gridColumn5.Caption = "鍒嗗尯缂栧彿";
this.gridColumn5.FieldName = "defectCode";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "query_USER_NAME";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 0;
this.gridColumn5.Width = 94;
@@ -255,7 +258,7 @@
// userName
//
this.userName.AppearanceCell.Options.UseFont = true;
- this.userName.Caption = "鍚嶇О";
+ this.userName.Caption = "鍒嗗尯鍚嶇О";
this.userName.FieldName = "defectName";
this.userName.MinWidth = 50;
this.userName.Name = "userName";
@@ -391,15 +394,15 @@
this.txt_defectCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_defectCode.Name = "txt_defectCode";
this.txt_defectCode.Properties.Appearance.Options.UseFont = true;
- this.txt_defectCode.Size = new System.Drawing.Size(164, 24);
+ this.txt_defectCode.Size = new System.Drawing.Size(169, 24);
this.txt_defectCode.StyleController = this.layoutMx1;
this.txt_defectCode.TabIndex = 128;
//
// txt_defectName
//
- this.txt_defectName.Location = new System.Drawing.Point(564, 12);
+ this.txt_defectName.Location = new System.Drawing.Point(574, 12);
this.txt_defectName.Name = "txt_defectName";
- this.txt_defectName.Size = new System.Drawing.Size(164, 24);
+ this.txt_defectName.Size = new System.Drawing.Size(169, 24);
this.txt_defectName.StyleController = this.layoutMx1;
this.txt_defectName.TabIndex = 129;
//
@@ -441,7 +444,7 @@
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
- this.Root.Size = new System.Drawing.Size(981, 48);
+ this.Root.Size = new System.Drawing.Size(1002, 48);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -449,17 +452,17 @@
this.layoutControlItem1.Control = this.txt_defectCode;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(240, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(245, 28);
this.layoutControlItem1.Text = "鍒嗗尯缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_defectName;
- this.layoutControlItem2.Location = new System.Drawing.Point(480, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(490, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(240, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(245, 28);
this.layoutControlItem2.Text = "鍒嗗尯鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -737,6 +740,14 @@
this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
this.lastLoginTime.Width = 180;
//
+ // 鍒嗗尯Guid
+ //
+ this.鍒嗗尯Guid.Caption = "gridColumn11";
+ this.鍒嗗尯Guid.FieldName = "guid";
+ this.鍒嗗尯Guid.MinWidth = 25;
+ this.鍒嗗尯Guid.Name = "鍒嗗尯Guid";
+ this.鍒嗗尯Guid.Width = 94;
+ //
// Frm_AreaBind
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -745,7 +756,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_AreaBind";
- this.Text = "鍒嗗尯缁戝畾";
+ this.Text = "浠撳簱鍒嗗尯缁戝畾";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -840,5 +851,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDel2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn 鍒嗗尯Guid;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
index d6444d2..a1e6e56 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
@@ -48,7 +48,6 @@
UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
-
if (dt.Rows.Count > 0)
{
gcMain1.DataSource = dt;
@@ -60,7 +59,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -71,7 +70,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -131,12 +130,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -216,16 +215,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0)
- {
- getModel(lbGuid.Text.Trim());
- }
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text.Trim());
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs
index 9f979fd..a9b5a1c 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectItem.cs
@@ -46,7 +46,7 @@
foreach (DataRow dr in dt.Rows)
{
string checkBox = dr["chkInt"].ToString();
- string _guid = dr["guid"].ToString();
+ string _guid = dr["itemId"].ToString();
if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
{
if (sbList.Length > 0)
@@ -68,15 +68,18 @@
"MesSysPageviewManager/SetUserBind",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
this.Close();
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
}
@@ -94,7 +97,12 @@
return;
}
var _sbSqlWhere = " and a.FSubsidiary=" + _orgId;
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.staff_no", "asc", "", _sbSqlWhere.ToString(), userGuid);
+ var pgq = new PageQueryModel(
+ curPage, 999999
+ , "org.FNumber asc ,a.staff_no", "asc"
+ , ""
+ , _sbSqlWhere.ToString()
+ , userGuid);//杩欐槸鍒嗗尯鐨刧uid
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -121,7 +129,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs
index 26dfe2f..ddb7595 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.Designer.cs
@@ -166,7 +166,7 @@
this.MinimizeBox = false;
this.Name = "SelectUser";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨璐﹀彿";
+ this.Text = "閫夋嫨Mes璐﹀彿";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs
index 89c6199..0ee2cdd 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectUser.cs
@@ -65,15 +65,18 @@
"MesSysPageviewManager/SetUserBind",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
this.Close();
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
}
@@ -112,7 +115,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3