From 96c18e8339a08c61385e0ba2d17801f22110f865 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 09 一月 2025 15:51:06 +0800
Subject: [PATCH] 细节修改
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 389 +++++++++++++++++++-----------------------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 16 +
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 41 +++-
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 1
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1
10 files changed, 203 insertions(+), 262 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index a645fe4..48985a7 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/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index c709b16..66183d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -124,6 +124,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 665298e..977bb32 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -37,7 +37,7 @@
this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.gv_materialGroup = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
- this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fforbidstatusTxt = new DevExpress.XtraEditors.TextEdit();
this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_produceWorkNo = new DevExpress.XtraEditors.LabelControl();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
@@ -56,7 +56,6 @@
this.gv_storeUnitNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_saleUnitNo = new DevExpress.XtraEditors.LabelControl();
this.gv_saleUnitNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_orderUnitNo = new DevExpress.XtraEditors.LabelControl();
this.lb_prdPack = new DevExpress.XtraEditors.LabelControl();
this.txt_prdPack = new DevExpress.XtraEditors.TextEdit();
this.gv_prdPack = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -66,8 +65,6 @@
this.lb_lowLimt = new DevExpress.XtraEditors.LabelControl();
this.txt_lowlimit = new DevExpress.XtraEditors.TextEdit();
this.gv_lowLimt = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_custNO = new DevExpress.XtraEditors.LabelControl();
- this.txt_custNO = new DevExpress.XtraEditors.TextEdit();
this.lb_itemVersion = new DevExpress.XtraEditors.LabelControl();
this.txt_itemVersion = new DevExpress.XtraEditors.TextEdit();
this.lb_itemType = new DevExpress.XtraEditors.LabelControl();
@@ -78,57 +75,48 @@
this.txt_itemDescription = new DevExpress.XtraEditors.TextEdit();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.lb_itemSname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemSname = new DevExpress.XtraEditors.TextEdit();
this.lb_itemName = new DevExpress.XtraEditors.LabelControl();
this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_itemUnit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_produceUnit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_saleunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_orderunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_storeunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_subconUnit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_fpurchaseunitid = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_depotCode = new Gs.DevApp.UserControl.UcLookCk();
+ this.txt_kfName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_wwName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_wlName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xxName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_scName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_cgName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatusTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lowlimit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_custNO.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -136,6 +124,13 @@
this.xtraTabPage1.SuspendLayout();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kfName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wwName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wlName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xxName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cgName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
this.SuspendLayout();
@@ -144,7 +139,7 @@
//
this.lb_fissueType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fissueType.Appearance.Options.UseFont = true;
- this.lb_fissueType.Location = new System.Drawing.Point(532, 151);
+ this.lb_fissueType.Location = new System.Drawing.Point(538, 117);
this.lb_fissueType.Name = "lb_fissueType";
this.lb_fissueType.Size = new System.Drawing.Size(85, 21);
this.lb_fissueType.TabIndex = 378;
@@ -153,7 +148,7 @@
//
// txt_fissueType
//
- this.txt_fissueType.Location = new System.Drawing.Point(620, 147);
+ this.txt_fissueType.Location = new System.Drawing.Point(626, 113);
this.txt_fissueType.Name = "txt_fissueType";
this.txt_fissueType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fissueType.Properties.Appearance.Options.UseFont = true;
@@ -165,7 +160,7 @@
//
this.lb_finishRate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_finishRate.Appearance.Options.UseFont = true;
- this.lb_finishRate.Location = new System.Drawing.Point(532, 184);
+ this.lb_finishRate.Location = new System.Drawing.Point(538, 152);
this.lb_finishRate.Name = "lb_finishRate";
this.lb_finishRate.Size = new System.Drawing.Size(85, 21);
this.lb_finishRate.TabIndex = 370;
@@ -174,7 +169,7 @@
//
// txt_ffinishreceiptoverrate
//
- this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(620, 180);
+ this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(626, 148);
this.txt_ffinishreceiptoverrate.Name = "txt_ffinishreceiptoverrate";
this.txt_ffinishreceiptoverrate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ffinishreceiptoverrate.Properties.Appearance.Options.UseFont = true;
@@ -186,7 +181,7 @@
//
this.lb_materialProperties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_materialProperties.Appearance.Options.UseFont = true;
- this.lb_materialProperties.Location = new System.Drawing.Point(272, 184);
+ this.lb_materialProperties.Location = new System.Drawing.Point(272, 152);
this.lb_materialProperties.Name = "lb_materialProperties";
this.lb_materialProperties.Size = new System.Drawing.Size(85, 21);
this.lb_materialProperties.TabIndex = 360;
@@ -195,7 +190,7 @@
//
// txt_materialProperti
//
- this.txt_materialProperti.Location = new System.Drawing.Point(361, 180);
+ this.txt_materialProperti.Location = new System.Drawing.Point(361, 148);
this.txt_materialProperti.Name = "txt_materialProperti";
this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
@@ -221,22 +216,22 @@
//
this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(272, 256);
+ this.lb_isStatus.Location = new System.Drawing.Point(787, 220);
this.lb_isStatus.Name = "lb_isStatus";
this.lb_isStatus.Size = new System.Drawing.Size(85, 21);
this.lb_isStatus.TabIndex = 343;
this.lb_isStatus.Tag = "isStatus";
this.lb_isStatus.Text = "绂佺敤鐘舵�侊細";
//
- // txt_fforbidstatus
+ // txt_fforbidstatusTxt
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(361, 252);
- this.txt_fforbidstatus.Name = "txt_fforbidstatus";
- this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
- this.txt_fforbidstatus.Size = new System.Drawing.Size(150, 28);
- this.txt_fforbidstatus.TabIndex = 343;
- this.txt_fforbidstatus.Tag = "isStatus";
+ this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(876, 216);
+ this.txt_fforbidstatusTxt.Name = "txt_fforbidstatusTxt";
+ this.txt_fforbidstatusTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fforbidstatusTxt.Properties.Appearance.Options.UseFont = true;
+ this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(150, 28);
+ this.txt_fforbidstatusTxt.TabIndex = 343;
+ this.txt_fforbidstatusTxt.Tag = "isStatus";
//
// gv_isStatus
//
@@ -257,7 +252,7 @@
//
this.lb_produceWorkNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_produceWorkNo.Appearance.Options.UseFont = true;
- this.lb_produceWorkNo.Location = new System.Drawing.Point(272, 221);
+ this.lb_produceWorkNo.Location = new System.Drawing.Point(272, 187);
this.lb_produceWorkNo.Name = "lb_produceWorkNo";
this.lb_produceWorkNo.Size = new System.Drawing.Size(85, 21);
this.lb_produceWorkNo.TabIndex = 336;
@@ -266,7 +261,7 @@
//
// txt_productionWorkshop
//
- this.txt_productionWorkshop.Location = new System.Drawing.Point(361, 217);
+ this.txt_productionWorkshop.Location = new System.Drawing.Point(361, 183);
this.txt_productionWorkshop.Name = "txt_productionWorkshop";
this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
@@ -278,7 +273,7 @@
//
this.lb_bomNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_bomNo.Appearance.Options.UseFont = true;
- this.lb_bomNo.Location = new System.Drawing.Point(272, 151);
+ this.lb_bomNo.Location = new System.Drawing.Point(272, 118);
this.lb_bomNo.Name = "lb_bomNo";
this.lb_bomNo.Size = new System.Drawing.Size(85, 21);
this.lb_bomNo.TabIndex = 319;
@@ -287,7 +282,7 @@
//
// txt_ppbom00019124
//
- this.txt_ppbom00019124.Location = new System.Drawing.Point(361, 147);
+ this.txt_ppbom00019124.Location = new System.Drawing.Point(361, 114);
this.txt_ppbom00019124.Name = "txt_ppbom00019124";
this.txt_ppbom00019124.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ppbom00019124.Properties.Appearance.Options.UseFont = true;
@@ -301,19 +296,20 @@
this.gv_bomNo.AppearanceCell.Options.UseFont = true;
this.gv_bomNo.Caption = "鐗╂枡鍒嗙被缂栧彿";
this.gv_bomNo.FieldName = "ppbom00019124";
- this.gv_bomNo.MinWidth = 80;
+ this.gv_bomNo.MaxWidth = 60;
+ this.gv_bomNo.MinWidth = 60;
this.gv_bomNo.Name = "gv_bomNo";
this.gv_bomNo.OptionsColumn.AllowEdit = false;
this.gv_bomNo.Tag = "query_a.bomNo";
this.gv_bomNo.Visible = true;
this.gv_bomNo.VisibleIndex = 7;
- this.gv_bomNo.Width = 94;
+ this.gv_bomNo.Width = 60;
//
// lb_depotNo
//
this.lb_depotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotNo.Appearance.Options.UseFont = true;
- this.lb_depotNo.Location = new System.Drawing.Point(14, 256);
+ this.lb_depotNo.Location = new System.Drawing.Point(538, 187);
this.lb_depotNo.Name = "lb_depotNo";
this.lb_depotNo.Size = new System.Drawing.Size(85, 21);
this.lb_depotNo.TabIndex = 312;
@@ -338,7 +334,7 @@
//
this.lb_subconUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_subconUnitNo.Appearance.Options.UseFont = true;
- this.lb_subconUnitNo.Location = new System.Drawing.Point(787, 80);
+ this.lb_subconUnitNo.Location = new System.Drawing.Point(787, 50);
this.lb_subconUnitNo.Name = "lb_subconUnitNo";
this.lb_subconUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_subconUnitNo.TabIndex = 306;
@@ -364,7 +360,7 @@
//
this.lb_purchaseUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_purchaseUnitNo.Appearance.Options.UseFont = true;
- this.lb_purchaseUnitNo.Location = new System.Drawing.Point(787, 221);
+ this.lb_purchaseUnitNo.Location = new System.Drawing.Point(787, 187);
this.lb_purchaseUnitNo.Name = "lb_purchaseUnitNo";
this.lb_purchaseUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_purchaseUnitNo.TabIndex = 298;
@@ -390,7 +386,7 @@
//
this.lb_produceUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_produceUnitNo.Appearance.Options.UseFont = true;
- this.lb_produceUnitNo.Location = new System.Drawing.Point(787, 184);
+ this.lb_produceUnitNo.Location = new System.Drawing.Point(787, 152);
this.lb_produceUnitNo.Name = "lb_produceUnitNo";
this.lb_produceUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_produceUnitNo.TabIndex = 291;
@@ -416,7 +412,7 @@
//
this.lb_storeUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_storeUnitNo.Appearance.Options.UseFont = true;
- this.lb_storeUnitNo.Location = new System.Drawing.Point(787, 46);
+ this.lb_storeUnitNo.Location = new System.Drawing.Point(787, 13);
this.lb_storeUnitNo.Name = "lb_storeUnitNo";
this.lb_storeUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_storeUnitNo.TabIndex = 285;
@@ -442,7 +438,7 @@
//
this.lb_saleUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_saleUnitNo.Appearance.Options.UseFont = true;
- this.lb_saleUnitNo.Location = new System.Drawing.Point(787, 151);
+ this.lb_saleUnitNo.Location = new System.Drawing.Point(787, 118);
this.lb_saleUnitNo.Name = "lb_saleUnitNo";
this.lb_saleUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_saleUnitNo.TabIndex = 280;
@@ -464,22 +460,11 @@
this.gv_saleUnitNo.VisibleIndex = 11;
this.gv_saleUnitNo.Width = 50;
//
- // lb_orderUnitNo
- //
- this.lb_orderUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_orderUnitNo.Appearance.Options.UseFont = true;
- this.lb_orderUnitNo.Location = new System.Drawing.Point(787, 13);
- this.lb_orderUnitNo.Name = "lb_orderUnitNo";
- this.lb_orderUnitNo.Size = new System.Drawing.Size(85, 21);
- this.lb_orderUnitNo.TabIndex = 273;
- this.lb_orderUnitNo.Tag = "orderUnitNo";
- this.lb_orderUnitNo.Text = "璁㈠崟鍗曚綅锛�";
- //
// lb_prdPack
//
this.lb_prdPack.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_prdPack.Appearance.Options.UseFont = true;
- this.lb_prdPack.Location = new System.Drawing.Point(515, 116);
+ this.lb_prdPack.Location = new System.Drawing.Point(521, 83);
this.lb_prdPack.Name = "lb_prdPack";
this.lb_prdPack.Size = new System.Drawing.Size(102, 21);
this.lb_prdPack.TabIndex = 267;
@@ -488,7 +473,7 @@
//
// txt_prdPack
//
- this.txt_prdPack.Location = new System.Drawing.Point(620, 112);
+ this.txt_prdPack.Location = new System.Drawing.Point(626, 79);
this.txt_prdPack.Name = "txt_prdPack";
this.txt_prdPack.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_prdPack.Properties.Appearance.Options.UseFont = true;
@@ -515,7 +500,7 @@
//
this.lb_highLimt.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_highLimt.Appearance.Options.UseFont = true;
- this.lb_highLimt.Location = new System.Drawing.Point(532, 46);
+ this.lb_highLimt.Location = new System.Drawing.Point(538, 13);
this.lb_highLimt.Name = "lb_highLimt";
this.lb_highLimt.Size = new System.Drawing.Size(85, 21);
this.lb_highLimt.TabIndex = 262;
@@ -524,7 +509,7 @@
//
// txt_highlimit
//
- this.txt_highlimit.Location = new System.Drawing.Point(620, 42);
+ this.txt_highlimit.Location = new System.Drawing.Point(626, 9);
this.txt_highlimit.Name = "txt_highlimit";
this.txt_highlimit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_highlimit.Properties.Appearance.Options.UseFont = true;
@@ -551,7 +536,7 @@
//
this.lb_lowLimt.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lowLimt.Appearance.Options.UseFont = true;
- this.lb_lowLimt.Location = new System.Drawing.Point(532, 80);
+ this.lb_lowLimt.Location = new System.Drawing.Point(538, 50);
this.lb_lowLimt.Name = "lb_lowLimt";
this.lb_lowLimt.Size = new System.Drawing.Size(85, 21);
this.lb_lowLimt.TabIndex = 258;
@@ -560,7 +545,7 @@
//
// txt_lowlimit
//
- this.txt_lowlimit.Location = new System.Drawing.Point(620, 73);
+ this.txt_lowlimit.Location = new System.Drawing.Point(626, 46);
this.txt_lowlimit.Name = "txt_lowlimit";
this.txt_lowlimit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lowlimit.Properties.Appearance.Options.UseFont = true;
@@ -583,32 +568,11 @@
this.gv_lowLimt.VisibleIndex = 4;
this.gv_lowLimt.Width = 50;
//
- // lb_custNO
- //
- this.lb_custNO.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_custNO.Appearance.Options.UseFont = true;
- this.lb_custNO.Location = new System.Drawing.Point(532, 13);
- this.lb_custNO.Name = "lb_custNO";
- this.lb_custNO.Size = new System.Drawing.Size(85, 21);
- this.lb_custNO.TabIndex = 235;
- this.lb_custNO.Tag = "custNO";
- this.lb_custNO.Text = "瀹㈡埛缂栧彿锛�";
- //
- // txt_custNO
- //
- this.txt_custNO.Location = new System.Drawing.Point(620, 9);
- this.txt_custNO.Name = "txt_custNO";
- this.txt_custNO.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_custNO.Properties.Appearance.Options.UseFont = true;
- this.txt_custNO.Size = new System.Drawing.Size(150, 28);
- this.txt_custNO.TabIndex = 235;
- this.txt_custNO.Tag = "custNO";
- //
// lb_itemVersion
//
this.lb_itemVersion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemVersion.Appearance.Options.UseFont = true;
- this.lb_itemVersion.Location = new System.Drawing.Point(272, 116);
+ this.lb_itemVersion.Location = new System.Drawing.Point(272, 83);
this.lb_itemVersion.Name = "lb_itemVersion";
this.lb_itemVersion.Size = new System.Drawing.Size(85, 21);
this.lb_itemVersion.TabIndex = 231;
@@ -617,7 +581,7 @@
//
// txt_itemVersion
//
- this.txt_itemVersion.Location = new System.Drawing.Point(361, 112);
+ this.txt_itemVersion.Location = new System.Drawing.Point(361, 79);
this.txt_itemVersion.Name = "txt_itemVersion";
this.txt_itemVersion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemVersion.Properties.Appearance.Options.UseFont = true;
@@ -629,7 +593,7 @@
//
this.lb_itemType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemType.Appearance.Options.UseFont = true;
- this.lb_itemType.Location = new System.Drawing.Point(272, 80);
+ this.lb_itemType.Location = new System.Drawing.Point(272, 50);
this.lb_itemType.Name = "lb_itemType";
this.lb_itemType.Size = new System.Drawing.Size(85, 21);
this.lb_itemType.TabIndex = 228;
@@ -638,7 +602,7 @@
//
// txt_itemType
//
- this.txt_itemType.Location = new System.Drawing.Point(361, 73);
+ this.txt_itemType.Location = new System.Drawing.Point(361, 46);
this.txt_itemType.Name = "txt_itemType";
this.txt_itemType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemType.Properties.Appearance.Options.UseFont = true;
@@ -650,7 +614,7 @@
//
this.lb_itemUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemUnitNo.Appearance.Options.UseFont = true;
- this.lb_itemUnitNo.Location = new System.Drawing.Point(787, 116);
+ this.lb_itemUnitNo.Location = new System.Drawing.Point(787, 83);
this.lb_itemUnitNo.Name = "lb_itemUnitNo";
this.lb_itemUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_itemUnitNo.TabIndex = 226;
@@ -676,7 +640,7 @@
//
this.lb_itemDescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemDescription.Appearance.Options.UseFont = true;
- this.lb_itemDescription.Location = new System.Drawing.Point(14, 221);
+ this.lb_itemDescription.Location = new System.Drawing.Point(14, 217);
this.lb_itemDescription.Name = "lb_itemDescription";
this.lb_itemDescription.Size = new System.Drawing.Size(85, 21);
this.lb_itemDescription.TabIndex = 222;
@@ -685,7 +649,7 @@
//
// txt_itemDescription
//
- this.txt_itemDescription.Location = new System.Drawing.Point(103, 217);
+ this.txt_itemDescription.Location = new System.Drawing.Point(101, 213);
this.txt_itemDescription.Name = "txt_itemDescription";
this.txt_itemDescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemDescription.Properties.Appearance.Options.UseFont = true;
@@ -709,19 +673,14 @@
this.gv_itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemModel.AppearanceCell.Options.UseFont = true;
this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
- this.gv_itemModel.ColumnEdit = this.repositoryItemMemoEdit1;
this.gv_itemModel.FieldName = "itemModel";
- this.gv_itemModel.MinWidth = 360;
+ this.gv_itemModel.MinWidth = 10;
this.gv_itemModel.Name = "gv_itemModel";
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.item_model";
this.gv_itemModel.Visible = true;
this.gv_itemModel.VisibleIndex = 3;
this.gv_itemModel.Width = 360;
- //
- // repositoryItemMemoEdit1
- //
- this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
//
// lb_itemSname
//
@@ -736,7 +695,7 @@
//
// txt_itemSname
//
- this.txt_itemSname.Location = new System.Drawing.Point(103, 180);
+ this.txt_itemSname.Location = new System.Drawing.Point(101, 180);
this.txt_itemSname.Name = "txt_itemSname";
this.txt_itemSname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemSname.Properties.Appearance.Options.UseFont = true;
@@ -762,19 +721,14 @@
this.gv_itemName.AppearanceCell.Options.UseTextOptions = true;
this.gv_itemName.AppearanceCell.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
- this.gv_itemName.ColumnEdit = this.repositoryItemMemoEdit2;
this.gv_itemName.FieldName = "itemName";
- this.gv_itemName.MinWidth = 250;
+ this.gv_itemName.MinWidth = 10;
this.gv_itemName.Name = "gv_itemName";
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.item_name";
this.gv_itemName.Visible = true;
this.gv_itemName.VisibleIndex = 2;
this.gv_itemName.Width = 250;
- //
- // repositoryItemMemoEdit2
- //
- this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2";
//
// lb_itemNo
//
@@ -811,27 +765,6 @@
this.gv_itemNo.VisibleIndex = 1;
this.gv_itemNo.Width = 120;
//
- // lb_factory
- //
- this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(306, 46);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(51, 21);
- this.lb_factory.TabIndex = 211;
- this.lb_factory.Tag = "factory";
- this.lb_factory.Text = "宸ュ巶锛�";
- //
- // txt_factory
- //
- this.txt_factory.Location = new System.Drawing.Point(361, 42);
- this.txt_factory.Name = "txt_factory";
- this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(150, 28);
- this.txt_factory.TabIndex = 211;
- this.txt_factory.Tag = "factory";
- //
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
@@ -854,9 +787,6 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemMemoEdit1,
- this.repositoryItemMemoEdit2});
this.gcMain.Size = new System.Drawing.Size(1158, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -911,6 +841,17 @@
this.gridColumn4.VisibleIndex = 0;
this.gridColumn4.Width = 250;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍚屾鏃堕棿";
+ this.gridColumn1.FieldName = "lastupdateDate";
+ this.gridColumn1.MinWidth = 180;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "query_a.lastupdate_date";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 17;
+ this.gridColumn1.Width = 180;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -953,14 +894,13 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_itemUnit);
- this.panel1.Controls.Add(this.txt_produceUnit);
- this.panel1.Controls.Add(this.txt_saleunit);
- this.panel1.Controls.Add(this.txt_orderunit);
- this.panel1.Controls.Add(this.txt_storeunit);
- this.panel1.Controls.Add(this.txt_subconUnit);
- this.panel1.Controls.Add(this.txt_fpurchaseunitid);
- this.panel1.Controls.Add(this.txt_depotCode);
+ this.panel1.Controls.Add(this.txt_kfName);
+ this.panel1.Controls.Add(this.txt_wwName);
+ this.panel1.Controls.Add(this.txt_wlName);
+ this.panel1.Controls.Add(this.txt_xxName);
+ this.panel1.Controls.Add(this.txt_scName);
+ this.panel1.Controls.Add(this.txt_cgName);
+ 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_fissueType);
@@ -970,7 +910,7 @@
this.panel1.Controls.Add(this.lb_materialProperties);
this.panel1.Controls.Add(this.txt_materialProperti);
this.panel1.Controls.Add(this.lb_isStatus);
- this.panel1.Controls.Add(this.txt_fforbidstatus);
+ this.panel1.Controls.Add(this.txt_fforbidstatusTxt);
this.panel1.Controls.Add(this.lb_produceWorkNo);
this.panel1.Controls.Add(this.txt_productionWorkshop);
this.panel1.Controls.Add(this.lb_bomNo);
@@ -981,15 +921,12 @@
this.panel1.Controls.Add(this.lb_produceUnitNo);
this.panel1.Controls.Add(this.lb_storeUnitNo);
this.panel1.Controls.Add(this.lb_saleUnitNo);
- this.panel1.Controls.Add(this.lb_orderUnitNo);
this.panel1.Controls.Add(this.lb_prdPack);
this.panel1.Controls.Add(this.txt_prdPack);
this.panel1.Controls.Add(this.lb_highLimt);
this.panel1.Controls.Add(this.txt_highlimit);
this.panel1.Controls.Add(this.lb_lowLimt);
this.panel1.Controls.Add(this.txt_lowlimit);
- this.panel1.Controls.Add(this.lb_custNO);
- this.panel1.Controls.Add(this.txt_custNO);
this.panel1.Controls.Add(this.lb_itemVersion);
this.panel1.Controls.Add(this.txt_itemVersion);
this.panel1.Controls.Add(this.lb_itemType);
@@ -1003,84 +940,87 @@
this.panel1.Controls.Add(this.lb_itemName);
this.panel1.Controls.Add(this.lb_itemNo);
this.panel1.Controls.Add(this.txt_itemNo);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.txt_itemName);
this.panel1.Controls.Add(this.txt_itemModel);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1058, 367);
+ this.panel1.Size = new System.Drawing.Size(1058, 312);
this.panel1.TabIndex = 1;
//
- // txt_itemUnit
+ // txt_kfName
//
- this.txt_itemUnit.IsReadly = false;
- this.txt_itemUnit.Location = new System.Drawing.Point(876, 112);
- this.txt_itemUnit.Name = "txt_itemUnit";
- this.txt_itemUnit.Size = new System.Drawing.Size(150, 28);
- this.txt_itemUnit.TabIndex = 405;
+ this.txt_kfName.Location = new System.Drawing.Point(876, 9);
+ this.txt_kfName.Name = "txt_kfName";
+ this.txt_kfName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_kfName.Properties.Appearance.Options.UseFont = true;
+ this.txt_kfName.Size = new System.Drawing.Size(150, 28);
+ this.txt_kfName.TabIndex = 412;
+ this.txt_kfName.Tag = "isStatus";
//
- // txt_produceUnit
+ // txt_wwName
//
- this.txt_produceUnit.IsReadly = false;
- this.txt_produceUnit.Location = new System.Drawing.Point(876, 180);
- this.txt_produceUnit.Name = "txt_produceUnit";
- this.txt_produceUnit.Size = new System.Drawing.Size(150, 28);
- this.txt_produceUnit.TabIndex = 404;
+ this.txt_wwName.Location = new System.Drawing.Point(876, 46);
+ this.txt_wwName.Name = "txt_wwName";
+ this.txt_wwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_wwName.Properties.Appearance.Options.UseFont = true;
+ this.txt_wwName.Size = new System.Drawing.Size(150, 28);
+ this.txt_wwName.TabIndex = 411;
+ this.txt_wwName.Tag = "isStatus";
//
- // txt_saleunit
+ // txt_wlName
//
- this.txt_saleunit.IsReadly = false;
- this.txt_saleunit.Location = new System.Drawing.Point(876, 147);
- this.txt_saleunit.Name = "txt_saleunit";
- this.txt_saleunit.Size = new System.Drawing.Size(150, 28);
- this.txt_saleunit.TabIndex = 403;
+ this.txt_wlName.Location = new System.Drawing.Point(876, 79);
+ this.txt_wlName.Name = "txt_wlName";
+ this.txt_wlName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_wlName.Properties.Appearance.Options.UseFont = true;
+ this.txt_wlName.Size = new System.Drawing.Size(150, 28);
+ this.txt_wlName.TabIndex = 410;
+ this.txt_wlName.Tag = "isStatus";
//
- // txt_orderunit
+ // txt_xxName
//
- this.txt_orderunit.IsReadly = false;
- this.txt_orderunit.Location = new System.Drawing.Point(876, 9);
- this.txt_orderunit.Name = "txt_orderunit";
- this.txt_orderunit.Size = new System.Drawing.Size(150, 28);
- this.txt_orderunit.TabIndex = 402;
+ this.txt_xxName.Location = new System.Drawing.Point(876, 114);
+ this.txt_xxName.Name = "txt_xxName";
+ this.txt_xxName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_xxName.Properties.Appearance.Options.UseFont = true;
+ this.txt_xxName.Size = new System.Drawing.Size(150, 28);
+ this.txt_xxName.TabIndex = 409;
+ this.txt_xxName.Tag = "isStatus";
//
- // txt_storeunit
+ // txt_scName
//
- this.txt_storeunit.IsReadly = false;
- this.txt_storeunit.Location = new System.Drawing.Point(876, 42);
- this.txt_storeunit.Name = "txt_storeunit";
- this.txt_storeunit.Size = new System.Drawing.Size(150, 28);
- this.txt_storeunit.TabIndex = 401;
+ this.txt_scName.Location = new System.Drawing.Point(876, 148);
+ this.txt_scName.Name = "txt_scName";
+ this.txt_scName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_scName.Properties.Appearance.Options.UseFont = true;
+ this.txt_scName.Size = new System.Drawing.Size(150, 28);
+ this.txt_scName.TabIndex = 408;
+ this.txt_scName.Tag = "isStatus";
//
- // txt_subconUnit
+ // txt_cgName
//
- this.txt_subconUnit.IsReadly = false;
- this.txt_subconUnit.Location = new System.Drawing.Point(876, 73);
- this.txt_subconUnit.Name = "txt_subconUnit";
- this.txt_subconUnit.Size = new System.Drawing.Size(150, 28);
- this.txt_subconUnit.TabIndex = 400;
+ this.txt_cgName.Location = new System.Drawing.Point(876, 183);
+ this.txt_cgName.Name = "txt_cgName";
+ this.txt_cgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_cgName.Properties.Appearance.Options.UseFont = true;
+ this.txt_cgName.Size = new System.Drawing.Size(150, 28);
+ this.txt_cgName.TabIndex = 407;
+ this.txt_cgName.Tag = "isStatus";
//
- // txt_fpurchaseunitid
+ // txt_dptName
//
- this.txt_fpurchaseunitid.IsReadly = false;
- this.txt_fpurchaseunitid.Location = new System.Drawing.Point(876, 217);
- this.txt_fpurchaseunitid.Name = "txt_fpurchaseunitid";
- this.txt_fpurchaseunitid.Size = new System.Drawing.Size(150, 28);
- this.txt_fpurchaseunitid.TabIndex = 399;
- //
- // txt_depotCode
- //
- this.txt_depotCode.IsReadly = false;
- this.txt_depotCode.Location = new System.Drawing.Point(103, 252);
- this.txt_depotCode.Margin = new System.Windows.Forms.Padding(0);
- this.txt_depotCode.Name = "txt_depotCode";
- this.txt_depotCode.Size = new System.Drawing.Size(150, 28);
- this.txt_depotCode.TabIndex = 398;
+ this.txt_dptName.Location = new System.Drawing.Point(626, 183);
+ 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 = 406;
+ this.txt_dptName.Tag = "isStatus";
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(36, 330);
+ this.labelControl11.Location = new System.Drawing.Point(555, 238);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1091,7 +1031,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(87, 330);
+ this.lbGuid.Location = new System.Drawing.Point(606, 238);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1117,17 +1057,6 @@
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "itemModel";
//
- // gridColumn1
- //
- this.gridColumn1.Caption = "鍚屾鏃堕棿";
- this.gridColumn1.FieldName = "lastupdateDate";
- this.gridColumn1.MinWidth = 180;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "query_a.lastupdate_date";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 17;
- this.gridColumn1.Width = 180;
- //
// Frm_MesItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1140,21 +1069,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatusTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lowlimit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_custNO.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1163,6 +1088,13 @@
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kfName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wwName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wlName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xxName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cgName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
this.ResumeLayout(false);
@@ -1191,7 +1123,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_materialGroup;
private DevExpress.XtraEditors.LabelControl lb_isStatus;
- private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
+ private DevExpress.XtraEditors.TextEdit txt_fforbidstatusTxt;
private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
private DevExpress.XtraEditors.LabelControl lb_produceWorkNo;
@@ -1219,8 +1151,6 @@
private DevExpress.XtraEditors.LabelControl lb_saleUnitNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_saleUnitNo;
- private DevExpress.XtraEditors.LabelControl lb_orderUnitNo;
-
private DevExpress.XtraEditors.LabelControl lb_prdPack;
private DevExpress.XtraEditors.TextEdit txt_prdPack;
private DevExpress.XtraGrid.Columns.GridColumn gv_prdPack;
@@ -1232,9 +1162,6 @@
private DevExpress.XtraEditors.LabelControl lb_lowLimt;
private DevExpress.XtraEditors.TextEdit txt_lowlimit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lowLimt;
-
- private DevExpress.XtraEditors.LabelControl lb_custNO;
- private DevExpress.XtraEditors.TextEdit txt_custNO;
private DevExpress.XtraEditors.LabelControl lb_itemVersion;
private DevExpress.XtraEditors.TextEdit txt_itemVersion;
@@ -1260,22 +1187,16 @@
private DevExpress.XtraEditors.LabelControl lb_itemNo;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
-
- private DevExpress.XtraEditors.LabelControl lb_factory;
- private DevExpress.XtraEditors.TextEdit txt_factory;
private DevExpress.XtraEditors.MemoEdit txt_itemName;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
- private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private UserControl.UcLookCk txt_depotCode;
- private UserControl.UcLookUnit txt_fpurchaseunitid;
- private UserControl.UcLookUnit txt_subconUnit;
- private UserControl.UcLookUnit txt_storeunit;
- private UserControl.UcLookUnit txt_orderunit;
- private UserControl.UcLookUnit txt_saleunit;
- private UserControl.UcLookUnit txt_produceUnit;
- private UserControl.UcLookUnit txt_itemUnit;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
+ private DevExpress.XtraEditors.TextEdit txt_cgName;
+ private DevExpress.XtraEditors.TextEdit txt_xxName;
+ private DevExpress.XtraEditors.TextEdit txt_scName;
+ private DevExpress.XtraEditors.TextEdit txt_wlName;
+ private DevExpress.XtraEditors.TextEdit txt_kfName;
+ private DevExpress.XtraEditors.TextEdit txt_wwName;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index d07bc39..ae05b6d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -122,6 +122,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 994ed2b..604af75 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -77,7 +77,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
return;
}
- var frm = new SelectCgMx(this.txt_suppId.GetId(), txt_receiveOrgId.GetId());
+ var frm = new SelectCgMx(this.txt_suppId.GetId(), txt_receiveOrgId.GetId(), (txt_fType.Checked == true ? 2 : 1).ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 4f1f005..9a2efed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -212,6 +212,7 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ gridView1.BestFitColumns();
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 67028d7..6679043 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -950,24 +950,23 @@
this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridBand3.Caption = "鍗曟嵁鐘舵��";
this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 130;
+ this.gridBand3.MinWidth = 70;
this.gridBand3.Name = "gridBand3";
this.gridBand3.RowCount = 2;
this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 130;
//
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
- this.gv_documentStatus.FieldName = "documentStatus";
+ this.gv_documentStatus.FieldName = "docStusTxt";
this.gv_documentStatus.MinWidth = 25;
this.gv_documentStatus.Name = "gv_documentStatus";
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
- this.gv_documentStatus.Width = 130;
+ this.gv_documentStatus.Width = 70;
//
// gridBand4
//
@@ -985,7 +984,7 @@
this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentType.AppearanceCell.Options.UseFont = true;
this.gv_documentType.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
- this.gv_documentType.FieldName = "documentType2";
+ this.gv_documentType.FieldName = "documentTypeTxt";
this.gv_documentType.MinWidth = 25;
this.gv_documentType.Name = "gv_documentType";
this.gv_documentType.OptionsColumn.AllowEdit = false;
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 3ae35d9..9bb5c42 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1652,6 +1652,7 @@
public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)
{
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
+ // gridView1.BestFitColumns();//鏁版嵁缁戝畾鍒癎ridView涔嬪悗璋冪敤BestFitColumns()鏂规硶
foreach (GridColumn column in gridView1.Columns)
{
column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index db66443..2df1456 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -40,8 +40,8 @@
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,6 +53,7 @@
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -98,7 +99,8 @@
this.gridColumn10,
this.gridColumn2,
this.gridColumn4,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -223,6 +225,18 @@
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 50;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "宸叉敹鏁伴噺";
+ this.gridColumn9.FieldName = "yssl";
+ this.gridColumn9.MaxWidth = 50;
+ this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 7;
+ this.gridColumn9.Width = 50;
+ //
// gridColumn7
//
this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Red;
@@ -238,18 +252,6 @@
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 50;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "宸叉敹鏁伴噺";
- this.gridColumn9.FieldName = "yssl";
- this.gridColumn9.MaxWidth = 50;
- this.gridColumn9.MinWidth = 50;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.OptionsColumn.ReadOnly = true;
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
- this.gridColumn9.Width = 50;
//
// gv_purchaseUnit
//
@@ -374,6 +376,16 @@
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn1.FieldName = "documentTypeTxt";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 14;
+ this.gridColumn1.Width = 60;
+ //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -422,5 +434,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 4c072fc..9427312 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -18,19 +18,23 @@
private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
private string receiveOrgId = "";
+ private string isWw = "";
/// <summary>
- /// 渚涘簲鍟嗙紪鍙�
+ ///
/// </summary>
- /// <param name="supp_no"></param>
- public SelectCgMx(string _suppId,string _receiveOrgId)
+ /// <param name="_suppId"></param>
+ /// <param name="_receiveOrgId"></param>
+ /// <param name="_isWw"></param>
+ public SelectCgMx(string _suppId, string _receiveOrgId, string _isWw)
{
InitializeComponent();
this.suppId = _suppId;
this.receiveOrgId = _receiveOrgId;
+ this.isWw= _isWw;
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
-
+
});
getPageList(1, UtilityHelper.GetPageSize());
btnIn.Click += (s, e) =>
@@ -79,9 +83,9 @@
everyPageSize = pageSize,
sortName = "",
keyWhere = "",
- inBusType = "CG",
+ inBusType = isWw,
inSupId = this.suppId,
- inReceiveOrgId=this.receiveOrgId,
+ inReceiveOrgId = this.receiveOrgId,
};
var json = JsonConvert.SerializeObject(_obj);
try
--
Gitblit v1.9.3