From 04638a49e4bc1644c48544c03e9f8883983b7ab6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 07 一月 2025 15:34:22 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 148 +++++++++++----------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 86 ++++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 1
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 133 ++++++++++---------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 21 +-
6 files changed, 207 insertions(+), 186 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index 0280a95..7ab4b5b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -195,7 +195,6 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -218,6 +217,7 @@
{
array.Add(a);
}
+ //杩欐槸鎵爜琛�
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
@@ -229,7 +229,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
+ //杩欐槸閫�璐ф槑缁� 琛�
JArray array1 = new JArray();
foreach (var a in _job["rtnData"]["list2"])
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 4f8c26e..4a6297c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -72,7 +72,7 @@
this.txt_stockInlimith = new DevExpress.XtraEditors.TextEdit();
this.gv_stockInlimith = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
- this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_caa024 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,10 +98,10 @@
this.txt_caa010 = new DevExpress.XtraEditors.TextEdit();
this.gv_caa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_caa009 = new DevExpress.XtraEditors.LabelControl();
- this.txt_caa009 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.gv_caa009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_caa006 = new DevExpress.XtraEditors.LabelControl();
- this.txt_caa006 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.gv_caa006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_caa005 = new DevExpress.XtraEditors.LabelControl();
this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
@@ -127,7 +127,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -137,14 +137,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa009.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa006.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).BeginInit();
@@ -157,6 +157,7 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -230,7 +231,7 @@
this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
- this.gvMx1depotCode.FieldName = "depotCode";
+ this.gvMx1depotCode.FieldName = "dptCode";
this.gvMx1depotCode.MinWidth = 50;
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
@@ -308,7 +309,7 @@
this.gvMx1cab009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1cab009.AppearanceCell.Options.UseFont = true;
this.gvMx1cab009.Caption = "鍗曚綅";
- this.gvMx1cab009.FieldName = "cab009";
+ this.gvMx1cab009.FieldName = "dwName";
this.gvMx1cab009.MinWidth = 50;
this.gvMx1cab009.Name = "gvMx1cab009";
this.gvMx1cab009.Tag = "query_a.CAB009";
@@ -347,7 +348,7 @@
this.gvMx1cab003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1cab003.AppearanceCell.Options.UseFont = true;
this.gvMx1cab003.Caption = "鏉愭枡缂栫爜";
- this.gvMx1cab003.FieldName = "cab003";
+ this.gvMx1cab003.FieldName = "wlbm";
this.gvMx1cab003.MinWidth = 50;
this.gvMx1cab003.Name = "gvMx1cab003";
this.gvMx1cab003.Tag = "query_a.CAB003";
@@ -383,7 +384,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage1.Text = "鏄庣粏";
//
// gcMx1
@@ -392,7 +393,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 338);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 355);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -442,6 +443,7 @@
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn14.FieldName = "itemName";
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
@@ -451,6 +453,7 @@
// gridColumn15
//
this.gridColumn15.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn15.FieldName = "dptName";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
@@ -460,6 +463,7 @@
// gridColumn16
//
this.gridColumn16.Caption = "渚涘簲绫诲瀷";
+ this.gridColumn16.FieldName = "gylx";
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
@@ -521,7 +525,7 @@
//
this.lb_saleOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_saleOrderNo.Appearance.Options.UseFont = true;
- this.lb_saleOrderNo.Location = new System.Drawing.Point(525, 55);
+ this.lb_saleOrderNo.Location = new System.Drawing.Point(525, 53);
this.lb_saleOrderNo.Name = "lb_saleOrderNo";
this.lb_saleOrderNo.Size = new System.Drawing.Size(90, 21);
this.lb_saleOrderNo.TabIndex = 450;
@@ -529,7 +533,7 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(623, 51);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(623, 49);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
@@ -610,7 +614,7 @@
//
this.lb_stockInlimitl.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stockInlimitl.Appearance.Options.UseFont = true;
- this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 89);
+ this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 86);
this.lb_stockInlimitl.Name = "lb_stockInlimitl";
this.lb_stockInlimitl.Size = new System.Drawing.Size(73, 21);
this.lb_stockInlimitl.TabIndex = 370;
@@ -618,7 +622,7 @@
//
// txt_stockInlimitl
//
- this.txt_stockInlimitl.Location = new System.Drawing.Point(336, 85);
+ this.txt_stockInlimitl.Location = new System.Drawing.Point(336, 82);
this.txt_stockInlimitl.Name = "txt_stockInlimitl";
this.txt_stockInlimitl.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_stockInlimitl.Properties.Appearance.Options.UseFont = true;
@@ -643,7 +647,7 @@
//
this.lb_stockInlimith.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stockInlimith.Appearance.Options.UseFont = true;
- this.lb_stockInlimith.Location = new System.Drawing.Point(260, 125);
+ this.lb_stockInlimith.Location = new System.Drawing.Point(260, 118);
this.lb_stockInlimith.Name = "lb_stockInlimith";
this.lb_stockInlimith.Size = new System.Drawing.Size(73, 21);
this.lb_stockInlimith.TabIndex = 360;
@@ -651,7 +655,7 @@
//
// txt_stockInlimith
//
- this.txt_stockInlimith.Location = new System.Drawing.Point(336, 121);
+ this.txt_stockInlimith.Location = new System.Drawing.Point(336, 114);
this.txt_stockInlimith.Name = "txt_stockInlimith";
this.txt_stockInlimith.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_stockInlimith.Properties.Appearance.Options.UseFont = true;
@@ -676,20 +680,20 @@
//
this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotCode.Appearance.Options.UseFont = true;
- this.lb_depotCode.Location = new System.Drawing.Point(49, 125);
+ this.lb_depotCode.Location = new System.Drawing.Point(49, 118);
this.lb_depotCode.Name = "lb_depotCode";
this.lb_depotCode.Size = new System.Drawing.Size(39, 21);
this.lb_depotCode.TabIndex = 327;
this.lb_depotCode.Text = "浠撳簱 ";
//
- // txt_depotCode
+ // txt_ckName
//
- this.txt_depotCode.Location = new System.Drawing.Point(95, 121);
- this.txt_depotCode.Name = "txt_depotCode";
- this.txt_depotCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(150, 28);
- this.txt_depotCode.TabIndex = 327;
+ this.txt_ckName.Location = new System.Drawing.Point(95, 114);
+ this.txt_ckName.Name = "txt_ckName";
+ this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_ckName.Properties.Appearance.Options.UseFont = true;
+ this.txt_ckName.Size = new System.Drawing.Size(150, 28);
+ this.txt_ckName.TabIndex = 327;
//
// gv_depotCode
//
@@ -751,7 +755,7 @@
//
this.lb_caa021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa021.Appearance.Options.UseFont = true;
- this.lb_caa021.Location = new System.Drawing.Point(15, 89);
+ this.lb_caa021.Location = new System.Drawing.Point(15, 86);
this.lb_caa021.Name = "lb_caa021";
this.lb_caa021.Size = new System.Drawing.Size(73, 21);
this.lb_caa021.TabIndex = 267;
@@ -775,7 +779,7 @@
//
this.lb_caa020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa020.Appearance.Options.UseFont = true;
- this.lb_caa020.Location = new System.Drawing.Point(495, 89);
+ this.lb_caa020.Location = new System.Drawing.Point(495, 86);
this.lb_caa020.Name = "lb_caa020";
this.lb_caa020.Size = new System.Drawing.Size(120, 21);
this.lb_caa020.TabIndex = 262;
@@ -783,7 +787,7 @@
//
// txt_caa020
//
- this.txt_caa020.Location = new System.Drawing.Point(623, 85);
+ this.txt_caa020.Location = new System.Drawing.Point(623, 82);
this.txt_caa020.Name = "txt_caa020";
this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_caa020.Properties.Appearance.Options.UseFont = true;
@@ -836,7 +840,7 @@
//
this.lb_caa016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa016.Appearance.Options.UseFont = true;
- this.lb_caa016.Location = new System.Drawing.Point(49, 164);
+ this.lb_caa016.Location = new System.Drawing.Point(49, 152);
this.lb_caa016.Name = "lb_caa016";
this.lb_caa016.Size = new System.Drawing.Size(39, 21);
this.lb_caa016.TabIndex = 243;
@@ -844,7 +848,7 @@
//
// txt_caa016
//
- this.txt_caa016.Location = new System.Drawing.Point(95, 160);
+ this.txt_caa016.Location = new System.Drawing.Point(95, 148);
this.txt_caa016.Name = "txt_caa016";
this.txt_caa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_caa016.Properties.Appearance.Options.UseFont = true;
@@ -916,7 +920,7 @@
//
this.lb_caa011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa011.Appearance.Options.UseFont = true;
- this.lb_caa011.Location = new System.Drawing.Point(780, 55);
+ this.lb_caa011.Location = new System.Drawing.Point(780, 53);
this.lb_caa011.Name = "lb_caa011";
this.lb_caa011.Size = new System.Drawing.Size(107, 21);
this.lb_caa011.TabIndex = 228;
@@ -924,7 +928,7 @@
//
// txt_caa011
//
- this.txt_caa011.Location = new System.Drawing.Point(893, 51);
+ this.txt_caa011.Location = new System.Drawing.Point(893, 49);
this.txt_caa011.Name = "txt_caa011";
this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_caa011.Properties.Appearance.Options.UseFont = true;
@@ -982,20 +986,20 @@
//
this.lb_caa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa009.Appearance.Options.UseFont = true;
- this.lb_caa009.Location = new System.Drawing.Point(294, 55);
+ this.lb_caa009.Location = new System.Drawing.Point(294, 53);
this.lb_caa009.Name = "lb_caa009";
this.lb_caa009.Size = new System.Drawing.Size(39, 21);
this.lb_caa009.TabIndex = 222;
this.lb_caa009.Text = "鍗曚綅 ";
//
- // txt_caa009
+ // txt_dwName
//
- this.txt_caa009.Location = new System.Drawing.Point(336, 51);
- this.txt_caa009.Name = "txt_caa009";
- this.txt_caa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa009.Properties.Appearance.Options.UseFont = true;
- this.txt_caa009.Size = new System.Drawing.Size(150, 28);
- this.txt_caa009.TabIndex = 222;
+ this.txt_dwName.Location = new System.Drawing.Point(336, 49);
+ this.txt_dwName.Name = "txt_dwName";
+ this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dwName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dwName.Size = new System.Drawing.Size(150, 28);
+ this.txt_dwName.TabIndex = 222;
//
// gv_caa009
//
@@ -1015,20 +1019,20 @@
//
this.lb_caa006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa006.Appearance.Options.UseFont = true;
- this.lb_caa006.Location = new System.Drawing.Point(15, 55);
+ this.lb_caa006.Location = new System.Drawing.Point(15, 53);
this.lb_caa006.Name = "lb_caa006";
this.lb_caa006.Size = new System.Drawing.Size(73, 21);
this.lb_caa006.TabIndex = 219;
this.lb_caa006.Text = "浜у搧缂栫爜 ";
//
- // txt_caa006
+ // txt_itemNo
//
- this.txt_caa006.Location = new System.Drawing.Point(95, 51);
- this.txt_caa006.Name = "txt_caa006";
- this.txt_caa006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa006.Properties.Appearance.Options.UseFont = true;
- this.txt_caa006.Size = new System.Drawing.Size(150, 28);
- this.txt_caa006.TabIndex = 219;
+ this.txt_itemNo.Location = new System.Drawing.Point(95, 49);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.TabIndex = 219;
//
// gv_caa006
//
@@ -1048,7 +1052,7 @@
//
this.lb_caa005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_caa005.Appearance.Options.UseFont = true;
- this.lb_caa005.Location = new System.Drawing.Point(780, 89);
+ this.lb_caa005.Location = new System.Drawing.Point(780, 86);
this.lb_caa005.Name = "lb_caa005";
this.lb_caa005.Size = new System.Drawing.Size(107, 21);
this.lb_caa005.TabIndex = 217;
@@ -1056,7 +1060,7 @@
//
// txt_caa005
//
- this.txt_caa005.Location = new System.Drawing.Point(893, 85);
+ this.txt_caa005.Location = new System.Drawing.Point(893, 82);
this.txt_caa005.Name = "txt_caa005";
this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_caa005.Properties.Appearance.Options.UseFont = true;
@@ -1323,10 +1327,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 200);
+ this.tabMx.Location = new System.Drawing.Point(0, 183);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 370);
+ this.tabMx.Size = new System.Drawing.Size(1126, 387);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1334,7 +1338,7 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_caa021);
+ this.panel1.Controls.Add(this.txt_dptName);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_saleOrderNo);
@@ -1344,7 +1348,7 @@
this.panel1.Controls.Add(this.lb_stockInlimith);
this.panel1.Controls.Add(this.txt_stockInlimith);
this.panel1.Controls.Add(this.lb_depotCode);
- this.panel1.Controls.Add(this.txt_depotCode);
+ this.panel1.Controls.Add(this.txt_ckName);
this.panel1.Controls.Add(this.lb_caa021);
this.panel1.Controls.Add(this.lb_caa020);
this.panel1.Controls.Add(this.txt_caa020);
@@ -1357,9 +1361,9 @@
this.panel1.Controls.Add(this.lb_caa010);
this.panel1.Controls.Add(this.txt_caa010);
this.panel1.Controls.Add(this.lb_caa009);
- this.panel1.Controls.Add(this.txt_caa009);
+ this.panel1.Controls.Add(this.txt_dwName);
this.panel1.Controls.Add(this.lb_caa006);
- this.panel1.Controls.Add(this.txt_caa006);
+ this.panel1.Controls.Add(this.txt_itemNo);
this.panel1.Controls.Add(this.lb_caa005);
this.panel1.Controls.Add(this.txt_caa005);
this.panel1.Controls.Add(this.lb_caa001);
@@ -1370,16 +1374,17 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 200);
+ this.panel1.Size = new System.Drawing.Size(1126, 183);
this.panel1.TabIndex = 1;
//
- // txt_caa021
+ // txt_dptName
//
- this.txt_caa021.IsReadly = false;
- this.txt_caa021.Location = new System.Drawing.Point(95, 85);
- this.txt_caa021.Name = "txt_caa021";
- this.txt_caa021.Size = new System.Drawing.Size(150, 28);
- this.txt_caa021.TabIndex = 451;
+ this.txt_dptName.Location = new System.Drawing.Point(95, 82);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(150, 28);
+ this.txt_dptName.TabIndex = 451;
//
// labelControl11
//
@@ -1427,14 +1432,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa009.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa006.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).EndInit();
@@ -1448,6 +1453,7 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1505,7 +1511,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_stockInlimith;
private DevExpress.XtraEditors.LabelControl lb_depotCode;
- private DevExpress.XtraEditors.TextEdit txt_depotCode;
+ private DevExpress.XtraEditors.TextEdit txt_ckName;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_caa024;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
@@ -1538,11 +1544,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_caa010;
private DevExpress.XtraEditors.LabelControl lb_caa009;
- private DevExpress.XtraEditors.TextEdit txt_caa009;
+ private DevExpress.XtraEditors.TextEdit txt_dwName;
private DevExpress.XtraGrid.Columns.GridColumn gv_caa009;
private DevExpress.XtraEditors.LabelControl lb_caa006;
- private DevExpress.XtraEditors.TextEdit txt_caa006;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_caa006;
private DevExpress.XtraEditors.LabelControl lb_caa005;
@@ -1562,12 +1568,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private UserControl.UcLookWorkshop txt_caa021;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index ae89f61..0d56ad9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,9 +69,7 @@
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.txtKdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
@@ -137,6 +135,8 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -146,8 +146,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
this.panelMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
@@ -176,6 +174,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx2oldqty
@@ -319,10 +319,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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)});
+ 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -564,11 +564,11 @@
//
// panelMx1
//
+ this.panelMx1.Controls.Add(this.txt_iCount_1);
+ this.panelMx1.Controls.Add(this.txt_psnQty_1);
this.panelMx1.Controls.Add(this.ucBtnPrint1);
this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
this.panelMx1.Controls.Add(this.labelControl12);
this.panelMx1.Controls.Add(this.txtKdy);
this.panelMx1.Controls.Add(this.labelControl13);
@@ -606,17 +606,6 @@
this.lbMxGuid.Text = "lbMxGuid";
this.lbMxGuid.Visible = false;
//
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
- this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
- this.txt_iCount_1.TabIndex = 228;
- //
// labelControl14
//
this.labelControl14.Location = new System.Drawing.Point(543, 39);
@@ -624,17 +613,6 @@
this.labelControl14.Size = new System.Drawing.Size(105, 18);
this.labelControl14.TabIndex = 227;
this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
- this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
- this.txt_psnQty_1.TabIndex = 226;
//
// labelControl12
//
@@ -1359,6 +1337,34 @@
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 211;
//
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(654, 4);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+ this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
+ this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_iCount_1.TabIndex = 264;
+ this.txt_iCount_1.Tag = "ReadOnly";
+ this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(654, 34);
+ this.txt_psnQty_1.Name = "txt_psnQty_1";
+ this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+ this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
+ this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_psnQty_1.TabIndex = 263;
+ this.txt_psnQty_1.Tag = "ReadOnly";
+ this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1378,8 +1384,6 @@
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
this.panelMx1.ResumeLayout(false);
this.panelMx1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
@@ -1409,6 +1413,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1496,9 +1502,7 @@
private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
private DevExpress.XtraEditors.LabelControl labelControl9;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.LabelControl labelControl14;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txtKdy;
private DevExpress.XtraEditors.LabelControl labelControl13;
@@ -1516,5 +1520,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 210fbfd..8d7bc78 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -69,11 +69,11 @@
this.panel1 = new System.Windows.Forms.Panel();
this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit();
this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -195,7 +195,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 390);
this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
//
// gcMx1
@@ -204,7 +204,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 384);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 390);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -263,7 +263,7 @@
//
this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate1.Appearance.Options.UseFont = true;
- this.lb_createDate1.Location = new System.Drawing.Point(271, 15);
+ this.lb_createDate1.Location = new System.Drawing.Point(271, 50);
this.lb_createDate1.Name = "lb_createDate1";
this.lb_createDate1.Size = new System.Drawing.Size(68, 21);
this.lb_createDate1.TabIndex = 252;
@@ -271,31 +271,33 @@
//
// txt_createDate1
//
- this.txt_createDate1.Location = new System.Drawing.Point(349, 12);
+ this.txt_createDate1.Location = new System.Drawing.Point(349, 46);
this.txt_createDate1.Name = "txt_createDate1";
this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate1.Size = new System.Drawing.Size(228, 28);
+ this.txt_createDate1.Size = new System.Drawing.Size(185, 28);
this.txt_createDate1.TabIndex = 252;
+ this.txt_createDate1.Tag = "";
//
// lb_itemUnit
//
this.lb_itemUnit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemUnit.Appearance.Options.UseFont = true;
- this.lb_itemUnit.Location = new System.Drawing.Point(11, 91);
+ this.lb_itemUnit.Location = new System.Drawing.Point(11, 117);
this.lb_itemUnit.Name = "lb_itemUnit";
- this.lb_itemUnit.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemUnit.Size = new System.Drawing.Size(68, 21);
this.lb_itemUnit.TabIndex = 231;
- this.lb_itemUnit.Text = "鐗╂枡鍗曚綅 ";
+ this.lb_itemUnit.Text = "鐗╂枡鍗曚綅";
//
// txt_itemUnit
//
- this.txt_itemUnit.Location = new System.Drawing.Point(85, 87);
+ this.txt_itemUnit.Location = new System.Drawing.Point(85, 113);
this.txt_itemUnit.Name = "txt_itemUnit";
this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
this.txt_itemUnit.Size = new System.Drawing.Size(150, 28);
this.txt_itemUnit.TabIndex = 231;
+ this.txt_itemUnit.Tag = "";
//
// gv_itemUnit
//
@@ -315,20 +317,21 @@
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(11, 123);
+ this.lb_itemModel.Location = new System.Drawing.Point(11, 84);
this.lb_itemModel.Name = "lb_itemModel";
- this.lb_itemModel.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 226;
- this.lb_itemModel.Text = "瑙勬牸鍨嬪彿 ";
+ this.lb_itemModel.Text = "瑙勬牸鍨嬪彿";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(85, 122);
+ this.txt_itemModel.Location = new System.Drawing.Point(85, 80);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(449, 28);
this.txt_itemModel.TabIndex = 226;
+ this.txt_itemModel.Tag = "";
//
// gv_itemModel
//
@@ -348,20 +351,21 @@
//
this.lb_itemName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemName.Appearance.Options.UseFont = true;
- this.lb_itemName.Location = new System.Drawing.Point(11, 52);
+ this.lb_itemName.Location = new System.Drawing.Point(11, 50);
this.lb_itemName.Name = "lb_itemName";
- this.lb_itemName.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemName.Size = new System.Drawing.Size(68, 21);
this.lb_itemName.TabIndex = 219;
- this.lb_itemName.Text = "鐗╂枡鍚嶇О ";
+ this.lb_itemName.Text = "鐗╂枡鍚嶇О";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(85, 52);
+ this.txt_itemName.Location = new System.Drawing.Point(85, 46);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(150, 28);
this.txt_itemName.TabIndex = 219;
+ this.txt_itemName.Tag = "";
//
// gv_itemName
//
@@ -395,6 +399,7 @@
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
this.txt_itemNo.TabIndex = 217;
+ this.txt_itemNo.Tag = "";
//
// gv_itemNo
//
@@ -524,10 +529,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 154);
+ this.tabMx.Location = new System.Drawing.Point(0, 148);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 416);
+ this.tabMx.Size = new System.Drawing.Size(1126, 422);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -537,11 +542,11 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_tc_1);
this.panel1.Controls.Add(this.txt_suppNo_1);
- this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.txt_iCount_1);
+ this.panel1.Controls.Add(this.txt_psnQty_1);
+ this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.labelControl4);
this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.txt_psnQty_1);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_suppId);
this.panel1.Controls.Add(this.labelControl1);
@@ -561,39 +566,29 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 154);
+ this.panel1.Size = new System.Drawing.Size(1126, 148);
this.panel1.TabIndex = 1;
//
// txt_tc_1
//
- this.txt_tc_1.Location = new System.Drawing.Point(697, 15);
+ this.txt_tc_1.Location = new System.Drawing.Point(854, 48);
this.txt_tc_1.Name = "txt_tc_1";
this.txt_tc_1.Properties.Caption = "";
- this.txt_tc_1.Size = new System.Drawing.Size(94, 24);
+ this.txt_tc_1.Size = new System.Drawing.Size(24, 24);
this.txt_tc_1.TabIndex = 265;
//
// txt_suppNo_1
//
this.txt_suppNo_1.IsReadly = false;
- this.txt_suppNo_1.Location = new System.Drawing.Point(349, 51);
+ this.txt_suppNo_1.Location = new System.Drawing.Point(645, 10);
this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppNo_1.Name = "txt_suppNo_1";
this.txt_suppNo_1.Size = new System.Drawing.Size(228, 30);
this.txt_suppNo_1.TabIndex = 264;
//
- // labelControl5
- //
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(587, 56);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(102, 21);
- this.labelControl5.TabIndex = 261;
- this.labelControl5.Text = "鎵撳嵃鏉＄爜寮犳暟";
- //
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(697, 49);
+ this.txt_iCount_1.Location = new System.Drawing.Point(645, 46);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
@@ -602,13 +597,38 @@
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
this.txt_iCount_1.TabIndex = 262;
+ this.txt_iCount_1.Tag = "readOnly-1";
this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(645, 80);
+ this.txt_psnQty_1.Name = "txt_psnQty_1";
+ this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+ this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
+ this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_psnQty_1.TabIndex = 258;
+ this.txt_psnQty_1.Tag = "readOnly-1";
+ this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(538, 50);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(102, 21);
+ this.labelControl5.TabIndex = 261;
+ this.labelControl5.Text = "鎵撳嵃鏉＄爜寮犳暟";
//
// labelControl4
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(655, 15);
+ this.labelControl4.Location = new System.Drawing.Point(812, 50);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(34, 21);
this.labelControl4.TabIndex = 259;
@@ -618,30 +638,17 @@
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(587, 91);
+ this.labelControl3.Location = new System.Drawing.Point(538, 84);
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(102, 21);
this.labelControl3.TabIndex = 257;
this.labelControl3.Text = "姣忓紶鏉＄爜鏁伴噺";
//
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(697, 87);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
- this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
- this.txt_psnQty_1.TabIndex = 258;
- this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
- //
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(254, 91);
+ this.labelControl2.Location = new System.Drawing.Point(257, 16);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(85, 21);
this.labelControl2.TabIndex = 255;
@@ -649,23 +656,23 @@
//
// txt_suppId
//
- this.txt_suppId.Enabled = false;
- this.txt_suppId.Location = new System.Drawing.Point(349, 87);
+ this.txt_suppId.Location = new System.Drawing.Point(349, 12);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_suppId.Properties.Appearance.Options.UseFont = true;
- this.txt_suppId.Size = new System.Drawing.Size(228, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(185, 28);
this.txt_suppId.TabIndex = 256;
+ this.txt_suppId.Tag = "";
//
// labelControl1
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(254, 56);
+ this.labelControl1.Location = new System.Drawing.Point(538, 15);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(85, 21);
+ this.labelControl1.Size = new System.Drawing.Size(102, 21);
this.labelControl1.TabIndex = 253;
- this.labelControl1.Text = "閫夋嫨渚涘簲鍟�";
+ this.labelControl1.Text = "鍏堥�夋嫨渚涘簲鍟�";
//
// labelControl11
//
@@ -763,9 +770,7 @@
private DevExpress.XtraEditors.TextEdit txt_suppId;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl5;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.LabelControl labelControl4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -773,5 +778,7 @@
private UserControl.UcLookSupplier txt_suppNo_1;
private DevExpress.XtraEditors.CheckEdit txt_tc_1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index a0ec718..b335efe 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -41,7 +41,6 @@
{
txt_suppId.Text = this.txt_suppNo_1.GetCode();
};
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 05ad39e..a4afad8 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -652,12 +652,9 @@
if (ctrl is TextEdit)
{
var txt = ctrl as TextEdit;
- if (_isRead(txt.Tag))
- {
- txt.ReadOnly = true;
- }
- else
- txt.ReadOnly = isEdt;
+ bool _bl = _isRead(txt.Tag, isEdt);
+ txt.ReadOnly = _bl;
+ // txt.ReadOnly = isEdt;
continue;
}
}
@@ -1152,13 +1149,19 @@
}
}
- private static bool _isRead(object obj)
+ private static bool _isRead(object obj,bool isEdt=false)
{
- if (obj != null && obj.ToString().ToUpper().Contains("readOnly".ToUpper()))
+ ///姘歌繙鏄彧璇荤殑
+ if (obj != null && obj.ToString().ToUpper()==("readOnly".ToUpper()))
{
return true;
}
- return false;
+ ///姘歌繙鏄彲鍐欑殑
+ if (obj != null && obj.ToString().ToUpper()==("readOnly-1".ToUpper()))
+ {
+ return false;
+ }
+ return isEdt;
}
/// <summary>
/// 鍒囨崲閫夐」鍗�
--
Gitblit v1.9.3