From d3dd87dbb75c485ca1c9431faffe2d9cae786e97 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 19 五月 2025 09:44:09 +0800
Subject: [PATCH] 其它入库
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 51 ++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 6 ++
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs | 5 ++
DevApp/Gs.DevApp/App.config | 4 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 23 +++++++++--
5 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index c2dd903..4a5b59e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index d4510f7..ea6b01d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -205,7 +205,7 @@
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -309,7 +309,7 @@
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -1268,7 +1268,7 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(462, 72);
+ this.layoutControl1.Location = new System.Drawing.Point(682, 72);
this.layoutControl1.Margin = new System.Windows.Forms.Padding(0);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 222, 812, 500);
@@ -1352,7 +1352,7 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(799, 41);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1019, 41);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
@@ -1361,7 +1361,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(801, 10);
+ this.radOut.Location = new System.Drawing.Point(1021, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1375,7 +1375,7 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(-106, 12);
+ this.txtWlid.Location = new System.Drawing.Point(114, 12);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
@@ -1385,7 +1385,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(566, 43);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(786, 43);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
@@ -1394,7 +1394,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(-106, 43);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 43);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1404,7 +1404,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(-106, 74);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 74);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1414,7 +1414,7 @@
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(566, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(786, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1426,7 +1426,7 @@
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(230, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(450, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
@@ -1436,7 +1436,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(230, 43);
+ this.txt_yQty.Location = new System.Drawing.Point(450, 43);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1929,7 +1929,7 @@
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit2});
+ this.rptChongDa});
this.gcMx2.Size = new System.Drawing.Size(1165, 334);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2099,24 +2099,24 @@
//
// gvBtnAlawys
//
- this.gvBtnAlawys.Caption = "绉诲嚭";
- this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvBtnAlawys.Caption = "閲嶆墦";
+ this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
this.gvBtnAlawys.VisibleIndex = 12;
this.gvBtnAlawys.Width = 94;
//
- // repositoryItemButtonEdit2
+ // rptChongDa
//
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ this.rptChongDa.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptChongDa.Name = "rptChongDa";
+ this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
// picCheckBox
//
@@ -2205,7 +2205,6 @@
this.split99.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
this.layout99.ResumeLayout(false);
- this.layout99.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
this.layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
@@ -2241,7 +2240,7 @@
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -2341,7 +2340,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit txt_qt005;
private DevExpress.XtraEditors.TextEdit txt_qt001;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index ef1066f..160a6fc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -474,6 +474,10 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
gcMx1.DataSource = null;
@@ -569,7 +573,11 @@
gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
}
-
+ /// <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;
@@ -727,9 +735,14 @@
{
getModel(lbGuid.Text.Trim());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ //gridView1.FocusedRowHandle = rowHandle;
+ //UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -767,12 +780,14 @@
}
}
/// <summary>
- /// 绉诲嚭鏉＄爜
+ /// 閲嶆墦鏉＄爜
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
+ MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
+ return;
var rowhandle = gvMx2.FocusedRowHandle;
if (rowhandle < 0)
return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index cfcdc86..47bf48f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -291,7 +291,11 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 閲嶆墦
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
index 64d2ad3..bb6a7f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
@@ -169,6 +169,7 @@
//
// cmbBaudRate
//
+ this.cmbBaudRate.EditValue = "9600";
this.cmbBaudRate.Location = new System.Drawing.Point(344, 43);
this.cmbBaudRate.Name = "cmbBaudRate";
this.cmbBaudRate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -227,6 +228,7 @@
//
// comParity
//
+ this.comParity.EditValue = "None";
this.comParity.Location = new System.Drawing.Point(94, 105);
this.comParity.Name = "comParity";
this.comParity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -326,11 +328,12 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.comParity;
+ this.layoutControlItem9.CustomizationFormText = "鏍￠獙浣�";
this.layoutControlItem9.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem9.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem9.Text = "鏍￠獙";
+ this.layoutControlItem9.Text = "鏍￠獙浣�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(70, 18);
//
// layoutControlItem4
--
Gitblit v1.9.3