到货单版本冲突

lu

4 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs

@@ -187,7 +187,7 @@
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
@@ -320,8 +320,6 @@
            this.gridColumn2.FieldName = "id";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            // 
            // gv_itemNo
@@ -334,7 +332,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 3;
            this.gv_itemNo.VisibleIndex = 2;
            this.gv_itemNo.Width = 120;
            // 
            // gv_itemName
@@ -349,7 +347,7 @@
            this.gv_itemName.OptionsColumn.AllowEdit = false;
            this.gv_itemName.Tag = "query_a.item_name";
            this.gv_itemName.Visible = true;
            this.gv_itemName.VisibleIndex = 4;
            this.gv_itemName.VisibleIndex = 3;
            this.gv_itemName.Width = 250;
            // 
            // gv_itemModel
@@ -362,7 +360,7 @@
            this.gv_itemModel.OptionsColumn.AllowEdit = false;
            this.gv_itemModel.Tag = "query_a.item_model";
            this.gv_itemModel.Visible = true;
            this.gv_itemModel.VisibleIndex = 5;
            this.gv_itemModel.VisibleIndex = 4;
            this.gv_itemModel.Width = 360;
            // 
            // gv_lowLimt
@@ -375,8 +373,6 @@
            this.gv_lowLimt.Name = "gv_lowLimt";
            this.gv_lowLimt.OptionsColumn.AllowEdit = false;
            this.gv_lowLimt.Tag = "query_a.lowlimit";
            this.gv_lowLimt.Visible = true;
            this.gv_lowLimt.VisibleIndex = 6;
            this.gv_lowLimt.Width = 50;
            // 
            // gv_highLimt
@@ -389,8 +385,6 @@
            this.gv_highLimt.Name = "gv_highLimt";
            this.gv_highLimt.OptionsColumn.AllowEdit = false;
            this.gv_highLimt.Tag = "query_a.highLimt";
            this.gv_highLimt.Visible = true;
            this.gv_highLimt.VisibleIndex = 7;
            this.gv_highLimt.Width = 50;
            // 
            // gv_prdPack
@@ -403,8 +397,6 @@
            this.gv_prdPack.Name = "gv_prdPack";
            this.gv_prdPack.OptionsColumn.AllowEdit = false;
            this.gv_prdPack.Tag = "query_a.prd_pack";
            this.gv_prdPack.Visible = true;
            this.gv_prdPack.VisibleIndex = 8;
            this.gv_prdPack.Width = 50;
            // 
            // gv_bomNo
@@ -429,7 +421,7 @@
            this.gv_materialGroup.OptionsColumn.AllowEdit = false;
            this.gv_materialGroup.Tag = "query_a.materialGroup";
            this.gv_materialGroup.Visible = true;
            this.gv_materialGroup.VisibleIndex = 9;
            this.gv_materialGroup.VisibleIndex = 5;
            this.gv_materialGroup.Width = 130;
            // 
            // gv_itemUnitNo
@@ -443,7 +435,7 @@
            this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_itemUnitNo.Tag = "query_c.fname";
            this.gv_itemUnitNo.Visible = true;
            this.gv_itemUnitNo.VisibleIndex = 10;
            this.gv_itemUnitNo.VisibleIndex = 6;
            this.gv_itemUnitNo.Width = 50;
            // 
            // gv_purchaseUnitNo
@@ -456,8 +448,6 @@
            this.gv_purchaseUnitNo.Name = "gv_purchaseUnitNo";
            this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnitNo.Tag = "query_d.fname";
            this.gv_purchaseUnitNo.Visible = true;
            this.gv_purchaseUnitNo.VisibleIndex = 11;
            this.gv_purchaseUnitNo.Width = 50;
            // 
            // gv_saleUnitNo
@@ -470,8 +460,6 @@
            this.gv_saleUnitNo.Name = "gv_saleUnitNo";
            this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_saleUnitNo.Tag = "query_e.fname";
            this.gv_saleUnitNo.Visible = true;
            this.gv_saleUnitNo.VisibleIndex = 12;
            this.gv_saleUnitNo.Width = 50;
            // 
            // gv_storeUnitNo
@@ -484,8 +472,6 @@
            this.gv_storeUnitNo.Name = "gv_storeUnitNo";
            this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_storeUnitNo.Tag = "query_f.fname";
            this.gv_storeUnitNo.Visible = true;
            this.gv_storeUnitNo.VisibleIndex = 13;
            this.gv_storeUnitNo.Width = 50;
            // 
            // gv_subconUnitNo
@@ -498,8 +484,6 @@
            this.gv_subconUnitNo.Name = "gv_subconUnitNo";
            this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_subconUnitNo.Tag = "query_g.fname";
            this.gv_subconUnitNo.Visible = true;
            this.gv_subconUnitNo.VisibleIndex = 14;
            this.gv_subconUnitNo.Width = 50;
            // 
            // gv_produceUnitNo
@@ -512,8 +496,6 @@
            this.gv_produceUnitNo.Name = "gv_produceUnitNo";
            this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_produceUnitNo.Tag = "query_h.fname";
            this.gv_produceUnitNo.Visible = true;
            this.gv_produceUnitNo.VisibleIndex = 15;
            this.gv_produceUnitNo.Width = 50;
            // 
            // gv_depotNo
@@ -538,7 +520,7 @@
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.Tag = "query_a.fforbidstatus";
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.VisibleIndex = 16;
            this.gv_isStatus.VisibleIndex = 7;
            this.gv_isStatus.Width = 50;
            // 
            // gridColumn1
@@ -552,7 +534,7 @@
            this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 21;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 180;
            // 
            // gridColumn3
@@ -569,8 +551,6 @@
            this.gridColumn6.FieldName = "ffinishreceiptoverrate";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 17;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn7
@@ -580,7 +560,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 18;
            this.gridColumn7.VisibleIndex = 8;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn8
@@ -589,8 +569,6 @@
            this.gridColumn8.FieldName = "fisbatchmanage";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 19;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn5
@@ -600,7 +578,7 @@
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 22;
            this.gridColumn5.VisibleIndex = 11;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn9
@@ -610,7 +588,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 20;
            this.gridColumn9.VisibleIndex = 9;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
@@ -620,7 +598,7 @@
            this.gridColumn10.MinWidth = 24;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 23;
            this.gridColumn10.VisibleIndex = 12;
            // 
            // pageBar1
            // 
@@ -696,10 +674,10 @@
            // 
            // txt_cgName
            // 
            this.txt_cgName.Location = new System.Drawing.Point(950, 158);
            this.txt_cgName.Location = new System.Drawing.Point(951, 156);
            this.txt_cgName.Name = "txt_cgName";
            this.txt_cgName.Properties.Appearance.Options.UseFont = true;
            this.txt_cgName.Size = new System.Drawing.Size(198, 24);
            this.txt_cgName.Size = new System.Drawing.Size(195, 24);
            this.txt_cgName.StyleController = this.layoutMx1;
            this.txt_cgName.TabIndex = 407;
            this.txt_cgName.Tag = "isStatus";
@@ -715,180 +693,180 @@
            // 
            // txt_scName
            // 
            this.txt_scName.Location = new System.Drawing.Point(665, 158);
            this.txt_scName.Location = new System.Drawing.Point(667, 156);
            this.txt_scName.Name = "txt_scName";
            this.txt_scName.Properties.Appearance.Options.UseFont = true;
            this.txt_scName.Size = new System.Drawing.Size(196, 24);
            this.txt_scName.Size = new System.Drawing.Size(193, 24);
            this.txt_scName.StyleController = this.layoutMx1;
            this.txt_scName.TabIndex = 408;
            this.txt_scName.Tag = "isStatus";
            // 
            // txt_fforbidstatusTxt
            // 
            this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(380, 121);
            this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(383, 120);
            this.txt_fforbidstatusTxt.Name = "txt_fforbidstatusTxt";
            this.txt_fforbidstatusTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(196, 24);
            this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(193, 24);
            this.txt_fforbidstatusTxt.StyleController = this.layoutMx1;
            this.txt_fforbidstatusTxt.TabIndex = 343;
            this.txt_fforbidstatusTxt.Tag = "isStatus";
            // 
            // txt_xxName
            // 
            this.txt_xxName.Location = new System.Drawing.Point(950, 121);
            this.txt_xxName.Location = new System.Drawing.Point(951, 120);
            this.txt_xxName.Name = "txt_xxName";
            this.txt_xxName.Properties.Appearance.Options.UseFont = true;
            this.txt_xxName.Size = new System.Drawing.Size(198, 24);
            this.txt_xxName.Size = new System.Drawing.Size(195, 24);
            this.txt_xxName.StyleController = this.layoutMx1;
            this.txt_xxName.TabIndex = 409;
            this.txt_xxName.Tag = "isStatus";
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(95, 84);
            this.txt_dptName.Location = new System.Drawing.Point(99, 84);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(196, 24);
            this.txt_dptName.Size = new System.Drawing.Size(193, 24);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 406;
            this.txt_dptName.Tag = "isStatus";
            // 
            // txt_wlName
            // 
            this.txt_wlName.Location = new System.Drawing.Point(950, 84);
            this.txt_wlName.Location = new System.Drawing.Point(951, 84);
            this.txt_wlName.Name = "txt_wlName";
            this.txt_wlName.Properties.Appearance.Options.UseFont = true;
            this.txt_wlName.Size = new System.Drawing.Size(198, 24);
            this.txt_wlName.Size = new System.Drawing.Size(195, 24);
            this.txt_wlName.StyleController = this.layoutMx1;
            this.txt_wlName.TabIndex = 410;
            this.txt_wlName.Tag = "isStatus";
            // 
            // txt_wwName
            // 
            this.txt_wwName.Location = new System.Drawing.Point(950, 47);
            this.txt_wwName.Location = new System.Drawing.Point(951, 48);
            this.txt_wwName.Name = "txt_wwName";
            this.txt_wwName.Properties.Appearance.Options.UseFont = true;
            this.txt_wwName.Size = new System.Drawing.Size(198, 24);
            this.txt_wwName.Size = new System.Drawing.Size(195, 24);
            this.txt_wwName.StyleController = this.layoutMx1;
            this.txt_wwName.TabIndex = 411;
            this.txt_wwName.Tag = "isStatus";
            // 
            // txt_kfName
            // 
            this.txt_kfName.Location = new System.Drawing.Point(950, 10);
            this.txt_kfName.Location = new System.Drawing.Point(951, 12);
            this.txt_kfName.Name = "txt_kfName";
            this.txt_kfName.Properties.Appearance.Options.UseFont = true;
            this.txt_kfName.Size = new System.Drawing.Size(198, 24);
            this.txt_kfName.Size = new System.Drawing.Size(195, 24);
            this.txt_kfName.StyleController = this.layoutMx1;
            this.txt_kfName.TabIndex = 412;
            this.txt_kfName.Tag = "isStatus";
            // 
            // txt_fissueType
            // 
            this.txt_fissueType.Location = new System.Drawing.Point(380, 84);
            this.txt_fissueType.Location = new System.Drawing.Point(383, 84);
            this.txt_fissueType.Name = "txt_fissueType";
            this.txt_fissueType.Properties.Appearance.Options.UseFont = true;
            this.txt_fissueType.Size = new System.Drawing.Size(196, 24);
            this.txt_fissueType.Size = new System.Drawing.Size(193, 24);
            this.txt_fissueType.StyleController = this.layoutMx1;
            this.txt_fissueType.TabIndex = 378;
            this.txt_fissueType.Tag = "fissueType";
            // 
            // txt_ffinishreceiptoverrate
            // 
            this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(665, 121);
            this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(667, 120);
            this.txt_ffinishreceiptoverrate.Name = "txt_ffinishreceiptoverrate";
            this.txt_ffinishreceiptoverrate.Properties.Appearance.Options.UseFont = true;
            this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(196, 24);
            this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(193, 24);
            this.txt_ffinishreceiptoverrate.StyleController = this.layoutMx1;
            this.txt_ffinishreceiptoverrate.TabIndex = 370;
            this.txt_ffinishreceiptoverrate.Tag = "finishRate";
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(95, 10);
            this.txt_itemName.Location = new System.Drawing.Point(99, 12);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(196, 33);
            this.txt_itemName.Size = new System.Drawing.Size(193, 32);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 216;
            this.txt_itemName.Tag = "itemName";
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(95, 158);
            this.txt_itemModel.Location = new System.Drawing.Point(99, 156);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(481, 34);
            this.txt_itemModel.Size = new System.Drawing.Size(477, 34);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 219;
            this.txt_itemModel.Tag = "itemModel";
            // 
            // txt_itemDescription
            // 
            this.txt_itemDescription.Location = new System.Drawing.Point(95, 47);
            this.txt_itemDescription.Location = new System.Drawing.Point(99, 48);
            this.txt_itemDescription.Name = "txt_itemDescription";
            this.txt_itemDescription.Properties.Appearance.Options.UseFont = true;
            this.txt_itemDescription.Size = new System.Drawing.Size(196, 24);
            this.txt_itemDescription.Size = new System.Drawing.Size(193, 24);
            this.txt_itemDescription.StyleController = this.layoutMx1;
            this.txt_itemDescription.TabIndex = 222;
            this.txt_itemDescription.Tag = "itemDescription";
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(380, 10);
            this.txt_itemNo.Location = new System.Drawing.Point(383, 12);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(196, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(193, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 213;
            this.txt_itemNo.Tag = "itemNo";
            // 
            // txt_materialProperti
            // 
            this.txt_materialProperti.Location = new System.Drawing.Point(380, 47);
            this.txt_materialProperti.Location = new System.Drawing.Point(383, 48);
            this.txt_materialProperti.Name = "txt_materialProperti";
            this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
            this.txt_materialProperti.Size = new System.Drawing.Size(196, 24);
            this.txt_materialProperti.Size = new System.Drawing.Size(193, 24);
            this.txt_materialProperti.StyleController = this.layoutMx1;
            this.txt_materialProperti.TabIndex = 360;
            this.txt_materialProperti.Tag = "materialProperties";
            // 
            // txt_productionWorkshop
            // 
            this.txt_productionWorkshop.Location = new System.Drawing.Point(665, 10);
            this.txt_productionWorkshop.Location = new System.Drawing.Point(667, 12);
            this.txt_productionWorkshop.Name = "txt_productionWorkshop";
            this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
            this.txt_productionWorkshop.Size = new System.Drawing.Size(196, 24);
            this.txt_productionWorkshop.Size = new System.Drawing.Size(193, 24);
            this.txt_productionWorkshop.StyleController = this.layoutMx1;
            this.txt_productionWorkshop.TabIndex = 336;
            this.txt_productionWorkshop.Tag = "produceWorkNo";
            // 
            // txt_highlimit
            // 
            this.txt_highlimit.Location = new System.Drawing.Point(665, 47);
            this.txt_highlimit.Location = new System.Drawing.Point(667, 48);
            this.txt_highlimit.Name = "txt_highlimit";
            this.txt_highlimit.Properties.Appearance.Options.UseFont = true;
            this.txt_highlimit.Size = new System.Drawing.Size(196, 24);
            this.txt_highlimit.Size = new System.Drawing.Size(193, 24);
            this.txt_highlimit.StyleController = this.layoutMx1;
            this.txt_highlimit.TabIndex = 262;
            this.txt_highlimit.Tag = "highLimt";
            // 
            // txt_lowlimit
            // 
            this.txt_lowlimit.Location = new System.Drawing.Point(665, 84);
            this.txt_lowlimit.Location = new System.Drawing.Point(667, 84);
            this.txt_lowlimit.Name = "txt_lowlimit";
            this.txt_lowlimit.Properties.Appearance.Options.UseFont = true;
            this.txt_lowlimit.Size = new System.Drawing.Size(196, 24);
            this.txt_lowlimit.Size = new System.Drawing.Size(193, 24);
            this.txt_lowlimit.StyleController = this.layoutMx1;
            this.txt_lowlimit.TabIndex = 258;
            this.txt_lowlimit.Tag = "lowLimt";
            // 
            // txt_prdPack
            // 
            this.txt_prdPack.Location = new System.Drawing.Point(95, 121);
            this.txt_prdPack.Location = new System.Drawing.Point(99, 120);
            this.txt_prdPack.Name = "txt_prdPack";
            this.txt_prdPack.Properties.Appearance.Options.UseFont = true;
            this.txt_prdPack.Size = new System.Drawing.Size(196, 24);
            this.txt_prdPack.Size = new System.Drawing.Size(193, 24);
            this.txt_prdPack.StyleController = this.layoutMx1;
            this.txt_prdPack.TabIndex = 267;
            this.txt_prdPack.Tag = "prdPack";
@@ -968,135 +946,135 @@
            this.layoutControlItem1.Control = this.txt_itemName;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem1.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem1.Text = "物料名称";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_itemNo;
            this.layoutControlItem5.Location = new System.Drawing.Point(285, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(284, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem5.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_kfName;
            this.layoutControlItem13.Location = new System.Drawing.Point(855, 0);
            this.layoutControlItem13.Location = new System.Drawing.Point(852, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(287, 37);
            this.layoutControlItem13.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem13.Text = "库房单位";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_wwName;
            this.layoutControlItem14.Location = new System.Drawing.Point(855, 37);
            this.layoutControlItem14.Location = new System.Drawing.Point(852, 36);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(287, 37);
            this.layoutControlItem14.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem14.Text = "委外单位";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_wlName;
            this.layoutControlItem15.Location = new System.Drawing.Point(855, 74);
            this.layoutControlItem15.Location = new System.Drawing.Point(852, 72);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(287, 37);
            this.layoutControlItem15.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem15.Text = "物料单位";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_xxName;
            this.layoutControlItem16.Location = new System.Drawing.Point(855, 111);
            this.layoutControlItem16.Location = new System.Drawing.Point(852, 108);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(287, 37);
            this.layoutControlItem16.Size = new System.Drawing.Size(286, 36);
            this.layoutControlItem16.Text = "销售单位";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_prdPack;
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 111);
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 108);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem17.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem17.Text = "最小包装数";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_fissueType;
            this.layoutControlItem18.Location = new System.Drawing.Point(285, 74);
            this.layoutControlItem18.Location = new System.Drawing.Point(284, 72);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem18.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem18.Text = "发料方式";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem23
            // 
            this.layoutControlItem23.Control = this.txt_fforbidstatusTxt;
            this.layoutControlItem23.Location = new System.Drawing.Point(285, 111);
            this.layoutControlItem23.Location = new System.Drawing.Point(284, 108);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem23.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem23.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem23.Text = "禁用状态";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_materialProperti;
            this.layoutControlItem9.Location = new System.Drawing.Point(285, 37);
            this.layoutControlItem9.Location = new System.Drawing.Point(284, 36);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem9.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem9.Text = "物料属性";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_productionWorkshop;
            this.layoutControlItem10.Location = new System.Drawing.Point(570, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(568, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem10.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem10.Text = "生产车间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_highlimit;
            this.layoutControlItem11.Location = new System.Drawing.Point(570, 37);
            this.layoutControlItem11.Location = new System.Drawing.Point(568, 36);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem11.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem11.Text = "最大库存";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_lowlimit;
            this.layoutControlItem12.Location = new System.Drawing.Point(570, 74);
            this.layoutControlItem12.Location = new System.Drawing.Point(568, 72);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem12.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem12.Text = "安全库存";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -1104,64 +1082,64 @@
            // 
            this.layoutControlItem19.Control = this.txt_ffinishreceiptoverrate;
            this.layoutControlItem19.CustomizationFormText = "入库超收比例(%)";
            this.layoutControlItem19.Location = new System.Drawing.Point(570, 111);
            this.layoutControlItem19.Location = new System.Drawing.Point(568, 108);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem19.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem19.Text = "超收比例";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem21
            // 
            this.layoutControlItem21.Control = this.txt_scName;
            this.layoutControlItem21.Location = new System.Drawing.Point(570, 148);
            this.layoutControlItem21.Location = new System.Drawing.Point(568, 144);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem21.Size = new System.Drawing.Size(285, 38);
            this.layoutControlItem21.Size = new System.Drawing.Size(284, 38);
            this.layoutControlItem21.Text = "生产单位";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem22
            // 
            this.layoutControlItem22.Control = this.txt_cgName;
            this.layoutControlItem22.Location = new System.Drawing.Point(855, 148);
            this.layoutControlItem22.Location = new System.Drawing.Point(852, 144);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem22.Size = new System.Drawing.Size(287, 38);
            this.layoutControlItem22.Size = new System.Drawing.Size(286, 38);
            this.layoutControlItem22.Text = "采购单位";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_itemModel;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 148);
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 144);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem2.Size = new System.Drawing.Size(570, 38);
            this.layoutControlItem2.Size = new System.Drawing.Size(568, 38);
            this.layoutControlItem2.Text = "规格型号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_itemDescription;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 37);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 36);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem4.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem4.Text = "物料描述";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_dptName;
            this.layoutControlItem20.Location = new System.Drawing.Point(0, 74);
            this.layoutControlItem20.Location = new System.Drawing.Point(0, 72);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem20.Size = new System.Drawing.Size(285, 37);
            this.layoutControlItem20.Size = new System.Drawing.Size(284, 36);
            this.layoutControlItem20.Text = "默认仓库";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
            //