From 89e9c658a4c3fe0a64ee67eecc84a928f303bacd Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 13 十一月 2025 15:52:28 +0800
Subject: [PATCH] caa解锁
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 98 ++++++++++++++++++++++++--------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 54 ++++++++++++++++-
2 files changed, 122 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 0ebf6a6..cecd8ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -41,6 +41,11 @@
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -194,7 +199,10 @@
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -289,6 +297,7 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1706,6 +1715,8 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
this.gcMx1.Size = new System.Drawing.Size(1462, 305);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1740,7 +1751,9 @@
this.gridColumn17,
this.gridColumn29,
this.gridColumn18,
- this.gridColumn40});
+ this.gridColumn40,
+ this.gridColumn42,
+ this.gridColumn43});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1767,7 +1780,7 @@
this.gvMx1cab002.Name = "gvMx1cab002";
this.gvMx1cab002.Tag = "query_a.CAB002";
this.gvMx1cab002.Visible = true;
- this.gvMx1cab002.VisibleIndex = 0;
+ this.gvMx1cab002.VisibleIndex = 2;
this.gvMx1cab002.Width = 94;
//
// gridColumn6
@@ -1777,7 +1790,7 @@
this.gridColumn6.MinWidth = 80;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 1;
+ this.gridColumn6.VisibleIndex = 3;
this.gridColumn6.Width = 94;
//
// gvMx1cab003
@@ -1789,7 +1802,7 @@
this.gvMx1cab003.Name = "gvMx1cab003";
this.gvMx1cab003.Tag = "query_a.CAB003";
this.gvMx1cab003.Visible = true;
- this.gvMx1cab003.VisibleIndex = 2;
+ this.gvMx1cab003.VisibleIndex = 4;
this.gvMx1cab003.Width = 94;
//
// gridColumn14
@@ -1799,7 +1812,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 3;
+ this.gridColumn14.VisibleIndex = 5;
this.gridColumn14.Width = 94;
//
// gridColumn10
@@ -1809,7 +1822,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 4;
+ this.gridColumn10.VisibleIndex = 6;
this.gridColumn10.Width = 94;
//
// gvMx1cab012
@@ -1821,7 +1834,7 @@
this.gvMx1cab012.Name = "gvMx1cab012";
this.gvMx1cab012.Tag = "query_a.CAB012";
this.gvMx1cab012.Visible = true;
- this.gvMx1cab012.VisibleIndex = 5;
+ this.gvMx1cab012.VisibleIndex = 7;
this.gvMx1cab012.Width = 94;
//
// gvMx1cab006
@@ -1833,7 +1846,7 @@
this.gvMx1cab006.Name = "gvMx1cab006";
this.gvMx1cab006.Tag = "query_a.CAB006";
this.gvMx1cab006.Visible = true;
- this.gvMx1cab006.VisibleIndex = 6;
+ this.gvMx1cab006.VisibleIndex = 8;
this.gvMx1cab006.Width = 94;
//
// gvMx1cab009
@@ -1845,7 +1858,7 @@
this.gvMx1cab009.Name = "gvMx1cab009";
this.gvMx1cab009.Tag = "query_a.CAB009";
this.gvMx1cab009.Visible = true;
- this.gvMx1cab009.VisibleIndex = 8;
+ this.gvMx1cab009.VisibleIndex = 10;
this.gvMx1cab009.Width = 94;
//
// gvMx1cab007
@@ -1857,7 +1870,7 @@
this.gvMx1cab007.Name = "gvMx1cab007";
this.gvMx1cab007.Tag = "query_a.CAB007";
this.gvMx1cab007.Visible = true;
- this.gvMx1cab007.VisibleIndex = 9;
+ this.gvMx1cab007.VisibleIndex = 11;
this.gvMx1cab007.Width = 94;
//
// gvMx1cab014
@@ -1869,7 +1882,7 @@
this.gvMx1cab014.Name = "gvMx1cab014";
this.gvMx1cab014.Tag = "query_a.CAB014";
this.gvMx1cab014.Visible = true;
- this.gvMx1cab014.VisibleIndex = 10;
+ this.gvMx1cab014.VisibleIndex = 12;
this.gvMx1cab014.Width = 94;
//
// gridColumn11
@@ -1879,7 +1892,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 20;
+ this.gridColumn11.VisibleIndex = 22;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -1889,7 +1902,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 21;
+ this.gridColumn12.VisibleIndex = 23;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1899,7 +1912,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 22;
+ this.gridColumn13.VisibleIndex = 24;
this.gridColumn13.Width = 94;
//
// gvMx1mtono
@@ -1921,7 +1934,7 @@
this.gvMx1numerator.Name = "gvMx1numerator";
this.gvMx1numerator.Tag = "query_a.NUMERATOR";
this.gvMx1numerator.Visible = true;
- this.gvMx1numerator.VisibleIndex = 11;
+ this.gvMx1numerator.VisibleIndex = 13;
this.gvMx1numerator.Width = 94;
//
// gvMx1denominator
@@ -1933,7 +1946,7 @@
this.gvMx1denominator.Name = "gvMx1denominator";
this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
this.gvMx1denominator.Visible = true;
- this.gvMx1denominator.VisibleIndex = 12;
+ this.gvMx1denominator.VisibleIndex = 14;
this.gvMx1denominator.Width = 94;
//
// gvMx1depotCode
@@ -1945,7 +1958,7 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 13;
+ this.gvMx1depotCode.VisibleIndex = 15;
this.gvMx1depotCode.Width = 94;
//
// gridColumn15
@@ -1955,7 +1968,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 14;
+ this.gridColumn15.VisibleIndex = 16;
this.gridColumn15.Width = 94;
//
// gvMx1issueType
@@ -1967,7 +1980,7 @@
this.gvMx1issueType.Name = "gvMx1issueType";
this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
this.gvMx1issueType.Visible = true;
- this.gvMx1issueType.VisibleIndex = 15;
+ this.gvMx1issueType.VisibleIndex = 17;
this.gvMx1issueType.Width = 94;
//
// gridColumn16
@@ -1977,7 +1990,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 16;
+ this.gridColumn16.VisibleIndex = 18;
this.gridColumn16.Width = 94;
//
// gvMx1scraprate
@@ -1989,7 +2002,7 @@
this.gvMx1scraprate.Name = "gvMx1scraprate";
this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
this.gvMx1scraprate.Visible = true;
- this.gvMx1scraprate.VisibleIndex = 17;
+ this.gvMx1scraprate.VisibleIndex = 19;
this.gvMx1scraprate.Width = 94;
//
// gvMx1scrapqty
@@ -2001,7 +2014,7 @@
this.gvMx1scrapqty.Name = "gvMx1scrapqty";
this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
this.gvMx1scrapqty.Visible = true;
- this.gvMx1scrapqty.VisibleIndex = 18;
+ this.gvMx1scrapqty.VisibleIndex = 20;
this.gvMx1scrapqty.Width = 94;
//
// gridColumn17
@@ -2011,7 +2024,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 19;
+ this.gridColumn17.VisibleIndex = 21;
this.gridColumn17.Width = 94;
//
// gridColumn29
@@ -2021,7 +2034,7 @@
this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 23;
+ this.gridColumn29.VisibleIndex = 25;
this.gridColumn29.Width = 94;
//
// gridColumn18
@@ -2043,8 +2056,39 @@
this.gridColumn40.MinWidth = 25;
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.Visible = true;
- this.gridColumn40.VisibleIndex = 7;
+ this.gridColumn40.VisibleIndex = 9;
this.gridColumn40.Width = 94;
+ //
+ // gridColumn42
+ //
+ this.gridColumn42.Caption = "瑙ｉ攣";
+ this.gridColumn42.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn42.MinWidth = 25;
+ this.gridColumn42.Name = "gridColumn42";
+ this.gridColumn42.Visible = true;
+ this.gridColumn42.VisibleIndex = 0;
+ this.gridColumn42.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "瑙ｉ攣", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn43
+ //
+ this.gridColumn43.Caption = "Erp閿�";
+ this.gridColumn43.FieldName = "isLockTxt";
+ this.gridColumn43.MinWidth = 25;
+ this.gridColumn43.Name = "gridColumn43";
+ this.gridColumn43.Visible = true;
+ this.gridColumn43.VisibleIndex = 1;
+ this.gridColumn43.Width = 94;
//
// Frm_Womcaa
//
@@ -2149,6 +2193,7 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -2307,5 +2352,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 88a231b..e9fea26 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -20,7 +20,7 @@
{
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
this.toolBarMenu1.btnLockClick += ToolBarMenu1_btnLockClick;
@@ -40,9 +40,6 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
-
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -83,7 +80,6 @@
_filterList = e.FilterList;
getPageList(1);
}
-
/// <summary>
/// 鍒锋柊浜嬩欢
@@ -327,5 +323,53 @@
}
}
+ /// <summary>
+ /// 鏄庣粏琛ㄧ敤鏂欐竻鍗曡В閿�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ var mxItemName = dr["itemName"].ToString();
+ var wlbm = dr["wlbm"].ToString();
+ var isLockTxt = dr["isLockTxt"].ToString();
+ if (!isLockTxt.StartsWith("1:"))
+ {
+ MsgHelper.ShowError("璇ョ墿鏂欐病鍔犻攣锛屾搷浣滃け璐ワ紒");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + wlbm + "锛�" + mxItemName + "銆戯紝纭畾瑙ｉ攣鐢ㄦ枡娓呭崟鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = mxGuid,
+ inFieldValue = 0,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmitLock",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3