From 699d70615b62bd6a04bda7789153373a40716992 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 15 二月 2025 15:12:56 +0800
Subject: [PATCH] 生产入库，其它入库
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 949 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 51 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs | 1188 ++++++++++++++----------------
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 48
9 files changed, 1,099 insertions(+), 1,147 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 63c664f..43a3a63 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,6 +1,9 @@
锘縰sing System;
using System.Configuration;
using System.Linq;
+using System.Management;
+using System.Net.Sockets;
+using System.Net;
using System.Windows.Forms;
using AutoUpdaterDotNET;
using DevExpress.XtraEditors;
@@ -47,10 +50,12 @@
txtUser.Focus();
return;
}
+ string strLog = GetMacAddress();
var _obj = new
{
accountPwd = txtPwd.Text.Trim(),
accountNo = txtUser.Text.Trim(),
+ accountLog = strLog
};
try
{
@@ -172,5 +177,51 @@
Application.Exit();
}
}
+
+
+ private string GetMacAddress()
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ try
+ {
+ sb.Append("涓绘満鍚�: ");
+ string hostName = Dns.GetHostName();
+ sb.Append(hostName);
+ sb.Append("锛汭Pv4: ");
+ IPAddress[] addresses = Dns.GetHostAddresses(hostName);
+ int i = 0;
+ foreach (IPAddress address in addresses)
+ {
+ if (address.AddressFamily == AddressFamily.InterNetwork) // 杩囨护鍑篒Pv4鍦板潃
+ {
+ if (i > 0)
+ sb.Append("锛�");
+ sb.Append(address.ToString());
+ }
+ }
+ i = 0;
+ sb.Append("锛汳AC: ");
+ ManagementClass mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
+ ManagementObjectCollection moc = mc.GetInstances();
+ string macAddress = string.Empty;
+ foreach (ManagementObject mo in moc)
+ {
+ if ((bool)mo["IPEnabled"])
+ {
+ if (i > 0)
+ sb.Append("锛�");
+ macAddress = mo["MacAddress"].ToString();
+ sb.Append(macAddress);
+ break;
+ }
+ }
+ return sb.ToString();
+ }
+ catch (Exception ex)
+ {
+ sb.Append(ex.Message);
+ }
+ return sb.ToString();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 8fbc2ef..e1fe990 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -29,24 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- this.gvMx2itemInId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1rbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -55,15 +47,13 @@
this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.lb_suppId = new DevExpress.XtraEditors.LabelControl();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_cbillNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
- this.lb_paperBillNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_abtNo = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
@@ -79,16 +69,11 @@
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_status = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_reason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_billTypeId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_transactionId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_userNoBack = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_taskNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_mmlist = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -96,9 +81,7 @@
this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transctionNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_sapstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_sapno = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_sapyear = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_saptext = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_ischeck = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -107,7 +90,6 @@
this.gv_company = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lineNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_mttransctionNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_taskLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_fbillno = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_fbillLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -116,15 +98,23 @@
this.gv_iqcReleaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_pickIns = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_rbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_bgr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_taskNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -148,9 +138,24 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_lyfx = new DevExpress.XtraEditors.TextEdit();
+ this.txt_hz = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_hzlx = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_djlx = new DevExpress.XtraEditors.TextEdit();
+ this.lb_djlx = new DevExpress.XtraEditors.LabelControl();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
+ this.lb_outPart = new DevExpress.XtraEditors.LabelControl();
+ this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
+ this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
- this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
@@ -161,8 +166,7 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -176,88 +180,19 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
- //
- // gvMx2itemInId
- //
- this.gvMx2itemInId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemInId.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemInId.Caption = "鍏ュ簱鍗昳d";
- this.gvMx2itemInId.FieldName = "itemInId";
- this.gvMx2itemInId.MinWidth = 50;
- this.gvMx2itemInId.Name = "gvMx2itemInId";
- this.gvMx2itemInId.Tag = "query_a.ITEM_IN_ID";
- this.gvMx2itemInId.Visible = true;
- this.gvMx2itemInId.VisibleIndex = 8;
- this.gvMx2itemInId.Width = 94;
- //
- // gvMx2itemId
- //
- this.gvMx2itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemId.Caption = "鐗╂枡ID";
- this.gvMx2itemId.FieldName = "itemId";
- this.gvMx2itemId.MinWidth = 50;
- this.gvMx2itemId.Name = "gvMx2itemId";
- this.gvMx2itemId.Tag = "query_a.ITEM_ID";
- this.gvMx2itemId.Visible = true;
- this.gvMx2itemId.VisibleIndex = 0;
- this.gvMx2itemId.Width = 94;
- //
- // gvMx2lineK3id
- //
- this.gvMx2lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx2lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
- this.gvMx2lineK3id.FieldName = "lineK3id";
- this.gvMx2lineK3id.MinWidth = 50;
- this.gvMx2lineK3id.Name = "gvMx2lineK3id";
- this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx2lineK3id.Visible = true;
- this.gvMx2lineK3id.VisibleIndex = 7;
- this.gvMx2lineK3id.Width = 94;
- //
- // gvMx2ebelnK3id
- //
- this.gvMx2ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx2ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
- this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx2ebelnK3id.MinWidth = 50;
- this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
- this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx2ebelnK3id.Visible = true;
- this.gvMx2ebelnK3id.VisibleIndex = 6;
- this.gvMx2ebelnK3id.Width = 94;
- //
- // gvMx2workNo
- //
- this.gvMx2workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx2workNo.Caption = "浠诲姟鍗曡鍙�";
- this.gvMx2workNo.FieldName = "workLine";
- this.gvMx2workNo.MinWidth = 50;
- this.gvMx2workNo.Name = "gvMx2workNo";
- this.gvMx2workNo.Tag = "query_a.WORK_NO";
- this.gvMx2workNo.Visible = true;
- this.gvMx2workNo.VisibleIndex = 5;
- this.gvMx2workNo.Width = 94;
- //
- // gvMx2ebeln
- //
- this.gvMx2ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx2ebeln.Caption = "閲囪喘璁㈠崟";
- this.gvMx2ebeln.FieldName = "ebeln";
- this.gvMx2ebeln.MinWidth = 50;
- this.gvMx2ebeln.Name = "gvMx2ebeln";
- this.gvMx2ebeln.Tag = "query_a.EBELN";
- this.gvMx2ebeln.Visible = true;
- this.gvMx2ebeln.VisibleIndex = 4;
- this.gvMx2ebeln.Width = 94;
//
// gvMx2unit
//
@@ -269,7 +204,7 @@
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
- this.gvMx2unit.VisibleIndex = 3;
+ this.gvMx2unit.VisibleIndex = 4;
this.gvMx2unit.Width = 94;
//
// gvMx2itemSname
@@ -282,7 +217,7 @@
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
- this.gvMx2itemSname.VisibleIndex = 1;
+ this.gvMx2itemSname.VisibleIndex = 2;
this.gvMx2itemSname.Width = 94;
//
// gvMx2quantity
@@ -295,25 +230,14 @@
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
- this.gvMx2quantity.VisibleIndex = 2;
+ this.gvMx2quantity.VisibleIndex = 3;
this.gvMx2quantity.Width = 94;
- //
- // gvMx2guid
- //
- this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid";
- this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
- this.gvMx2guid.Name = "gvMx2guid";
- this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 394);
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 362);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
@@ -322,7 +246,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(1344, 394);
+ this.gcMx1.Size = new System.Drawing.Size(1344, 362);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -330,87 +254,58 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx2guid,
- this.gvMx2itemId,
+ this.gridColumn3,
+ this.gridColumn4,
this.gvMx2itemSname,
this.gvMx2quantity,
this.gvMx2unit,
- this.gvMx2ebeln,
- this.gvMx2workNo,
- this.gvMx2itemInId,
- this.gvMx2ebelnK3id,
- this.gvMx2lineK3id});
+ this.gridColumn5,
+ this.gridColumn6});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // gvMx1lineK3id
+ // gridColumn3
//
- this.gvMx1lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
- this.gvMx1lineK3id.FieldName = "lineK3id";
- this.gvMx1lineK3id.MinWidth = 50;
- this.gvMx1lineK3id.Name = "gvMx1lineK3id";
- this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx1lineK3id.Visible = true;
- this.gvMx1lineK3id.VisibleIndex = 12;
- this.gvMx1lineK3id.Width = 94;
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 94;
//
- // gvMx1ebelnK3id
+ // gridColumn4
//
- this.gvMx1ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
- this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx1ebelnK3id.MinWidth = 50;
- this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
- this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx1ebelnK3id.Visible = true;
- this.gvMx1ebelnK3id.VisibleIndex = 11;
- this.gvMx1ebelnK3id.Width = 94;
+ this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
//
- // gvMx1rbillNo
+ // gridColumn5
//
- this.gvMx1rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1rbillNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1rbillNo.Caption = "鍒拌揣鍗曞彿";
- this.gvMx1rbillNo.FieldName = "cbillNo";
- this.gvMx1rbillNo.MinWidth = 50;
- this.gvMx1rbillNo.Name = "gvMx1rbillNo";
- this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
- this.gvMx1rbillNo.Visible = true;
- this.gvMx1rbillNo.VisibleIndex = 9;
- this.gvMx1rbillNo.Width = 94;
+ this.gridColumn5.Caption = "寤虹珛鑰�";
+ this.gridColumn5.FieldName = "createBy";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 94;
//
- // gvMx1urgentFlag
+ // gridColumn6
//
- this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪";
- this.gvMx1urgentFlag.FieldName = "urgentFlag";
- this.gvMx1urgentFlag.MinWidth = 50;
- this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
- this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
- this.gvMx1urgentFlag.Visible = true;
- this.gvMx1urgentFlag.VisibleIndex = 0;
- this.gvMx1urgentFlag.Width = 94;
- //
- // gvMx1workNo
- //
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
- this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 50;
- this.gvMx1workNo.Name = "gvMx1workNo";
- this.gvMx1workNo.Tag = "query_a.WORK_NO";
- this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 2;
- this.gvMx1workNo.Width = 94;
+ this.gridColumn6.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn6.FieldName = "createDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
//
// gvMx1unit
//
@@ -422,7 +317,7 @@
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
- this.gvMx1unit.VisibleIndex = 8;
+ this.gvMx1unit.VisibleIndex = 5;
this.gvMx1unit.Width = 94;
//
// gvMx1itemSname
@@ -435,7 +330,7 @@
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
- this.gvMx1itemSname.VisibleIndex = 5;
+ this.gvMx1itemSname.VisibleIndex = 2;
this.gvMx1itemSname.Width = 94;
//
// gvMx1depotSectionCode
@@ -461,7 +356,7 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 10;
+ this.gvMx1depotCode.VisibleIndex = 6;
this.gvMx1depotCode.Width = 94;
//
// gvMx1itemNo
@@ -474,7 +369,7 @@
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 6;
+ this.gvMx1itemNo.VisibleIndex = 3;
this.gvMx1itemNo.Width = 94;
//
// gvMx1quantity
@@ -500,7 +395,7 @@
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
- this.gvMx1cItemCode.VisibleIndex = 3;
+ this.gvMx1cItemCode.VisibleIndex = 1;
this.gvMx1cItemCode.Width = 94;
//
// gvMx1itemBarcode
@@ -513,25 +408,14 @@
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
- this.gvMx1itemBarcode.VisibleIndex = 1;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
this.gvMx1itemBarcode.Width = 94;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1344, 394);
+ this.tabMxPage1.Size = new System.Drawing.Size(1344, 362);
this.tabMxPage1.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
@@ -540,7 +424,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1344, 394);
+ this.gcMx2.Size = new System.Drawing.Size(1344, 362);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -548,80 +432,66 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gvMx1urgentFlag,
this.gvMx1itemBarcode,
- this.gvMx1workNo,
this.gvMx1cItemCode,
this.gvMx1itemSname,
this.gvMx1itemNo,
this.gvMx1quantity,
this.gvMx1unit,
- this.gvMx1rbillNo,
- this.gvMx1depotSectionCode,
this.gvMx1depotCode,
- this.gvMx1ebelnK3id,
- this.gvMx1lineK3id});
+ this.gvMx1depotSectionCode,
+ this.gridColumn1,
+ this.gridColumn2});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
- // lb_suppId
+ // gridColumn1
//
- this.lb_suppId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_suppId.Appearance.Options.UseFont = true;
- this.lb_suppId.Location = new System.Drawing.Point(5, 62);
- this.lb_suppId.Name = "lb_suppId";
- this.lb_suppId.Size = new System.Drawing.Size(85, 21);
- this.lb_suppId.TabIndex = 585;
- this.lb_suppId.Text = "渚涘簲鍟嗗悕绉�";
+ this.gridColumn1.Caption = "寤虹珛鑰�";
+ this.gridColumn1.FieldName = "createBy";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 8;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn2.FieldName = "createDate";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 94;
//
// lb_cbillNo
//
this.lb_cbillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_cbillNo.Appearance.Options.UseFont = true;
- this.lb_cbillNo.Location = new System.Drawing.Point(333, 23);
+ this.lb_cbillNo.Location = new System.Drawing.Point(330, 19);
this.lb_cbillNo.Name = "lb_cbillNo";
this.lb_cbillNo.Size = new System.Drawing.Size(68, 21);
this.lb_cbillNo.TabIndex = 507;
- this.lb_cbillNo.Text = "鍒拌揣鍗曞彿";
+ this.lb_cbillNo.Text = "鐢宠鍗曞彿";
//
- // txt_cbillNo
+ // txt_abtNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(408, 19);
- this.txt_cbillNo.Name = "txt_cbillNo";
- this.txt_cbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(150, 28);
- this.txt_cbillNo.TabIndex = 507;
- //
- // lb_paperBillNo
- //
- this.lb_paperBillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_paperBillNo.Appearance.Options.UseFont = true;
- this.lb_paperBillNo.Location = new System.Drawing.Point(333, 64);
- this.lb_paperBillNo.Name = "lb_paperBillNo";
- this.lb_paperBillNo.Size = new System.Drawing.Size(68, 21);
- this.lb_paperBillNo.TabIndex = 243;
- this.lb_paperBillNo.Text = "閫佽揣鍗曞彿";
- //
- // txt_paperBillNo
- //
- this.txt_paperBillNo.Location = new System.Drawing.Point(408, 60);
- this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(150, 28);
- this.txt_paperBillNo.TabIndex = 243;
+ this.txt_abtNo.Location = new System.Drawing.Point(402, 15);
+ this.txt_abtNo.Name = "txt_abtNo";
+ this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_abtNo.Size = new System.Drawing.Size(188, 28);
+ this.txt_abtNo.TabIndex = 507;
//
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(362, 102);
+ this.lb_remark.Location = new System.Drawing.Point(45, 140);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 240;
@@ -629,56 +499,56 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(405, 102);
+ this.txt_remark.Location = new System.Drawing.Point(90, 140);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(386, 28);
+ this.txt_remark.Size = new System.Drawing.Size(500, 28);
this.txt_remark.TabIndex = 240;
//
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(562, 65);
+ this.lb_createDate.Location = new System.Drawing.Point(601, 113);
this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_createDate.Size = new System.Drawing.Size(68, 21);
this.lb_createDate.TabIndex = 222;
- this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
+ this.lb_createDate.Text = "鍒涘缓鏃堕棿";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(641, 61);
+ this.txt_createDate.Location = new System.Drawing.Point(673, 109);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(156, 28);
this.txt_createDate.TabIndex = 222;
//
// lb_createBy
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(579, 26);
+ this.lb_createBy.Location = new System.Drawing.Point(618, 81);
this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(56, 21);
+ this.lb_createBy.Size = new System.Drawing.Size(51, 21);
this.lb_createBy.TabIndex = 219;
- this.lb_createBy.Text = "鍒涘缓浜� ";
+ this.lb_createBy.Text = "鍒涘缓浜�";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(639, 22);
+ this.txt_createBy.Location = new System.Drawing.Point(673, 77);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(156, 28);
this.txt_createBy.TabIndex = 219;
//
// lb_depotsId
//
this.lb_depotsId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotsId.Appearance.Options.UseFont = true;
- this.lb_depotsId.Location = new System.Drawing.Point(22, 102);
+ this.lb_depotsId.Location = new System.Drawing.Point(330, 113);
this.lb_depotsId.Name = "lb_depotsId";
this.lb_depotsId.Size = new System.Drawing.Size(68, 21);
this.lb_depotsId.TabIndex = 216;
@@ -688,7 +558,7 @@
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(810, 26);
+ this.lb_status.Location = new System.Drawing.Point(835, 81);
this.lb_status.Name = "lb_status";
this.lb_status.Size = new System.Drawing.Size(68, 21);
this.lb_status.TabIndex = 213;
@@ -698,7 +568,7 @@
//
this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billNo.Appearance.Options.UseFont = true;
- this.lb_billNo.Location = new System.Drawing.Point(22, 23);
+ this.lb_billNo.Location = new System.Drawing.Point(16, 19);
this.lb_billNo.Name = "lb_billNo";
this.lb_billNo.Size = new System.Drawing.Size(68, 21);
this.lb_billNo.TabIndex = 211;
@@ -706,11 +576,11 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(99, 19);
+ this.txt_billNo.Location = new System.Drawing.Point(90, 15);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(228, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(232, 28);
this.txt_billNo.TabIndex = 211;
//
// toolBarMenu1
@@ -746,10 +616,14 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
this.gridBand1,
+ this.gridBand16,
this.gridBand2,
this.gridBand3,
+ this.gridBand17,
+ this.gridBand18,
this.gridBand5,
this.gridBand4,
+ this.gridBand15,
this.gridBand6,
this.gridBand7,
this.gridBand8,
@@ -767,8 +641,6 @@
this.gv_createDate,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
- this.gv_billTypeId,
- this.gv_transactionId,
this.gv_remark,
this.gv_paperBillNo,
this.gv_userNoBack,
@@ -783,10 +655,7 @@
this.gv_depotsCode,
this.gv_transctionNo,
this.gv_suppNo,
- this.gv_fstatus,
- this.gv_factory,
this.gv_sapstatus,
- this.gv_sapno,
this.gv_sapyear,
this.gv_saptext,
this.gv_ischeck,
@@ -795,7 +664,6 @@
this.gv_company,
this.gv_urgentFlag,
this.gv_lineNo,
- this.gv_mttransctionNo,
this.gv_taskLino,
this.gv_fbillno,
this.gv_fbillLino,
@@ -805,8 +673,10 @@
this.gv_cbillNo,
this.gv_pickIns,
this.gv_rbillNo,
- this.gv_bgr,
- this.gv_suppId});
+ this.gv_suppId,
+ this.bandedGridColumn3,
+ this.bandedGridColumn4,
+ this.bandedGridColumn5});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -821,16 +691,11 @@
this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridBand1.Caption = "瀹℃牳鏍囪";
this.gridBand1.Columns.Add(this.gv_status);
- this.gridBand1.Columns.Add(this.gv_fstatus);
this.gridBand1.Columns.Add(this.gv_guid);
this.gridBand1.Columns.Add(this.gv_reason);
this.gridBand1.Columns.Add(this.gv_lastupdateBy);
this.gridBand1.Columns.Add(this.gv_lastupdateDate);
- this.gridBand1.Columns.Add(this.gv_billTypeId);
- this.gridBand1.Columns.Add(this.gv_transactionId);
this.gridBand1.Columns.Add(this.gv_userNoBack);
- this.gridBand1.Columns.Add(this.gv_checkUser);
- this.gridBand1.Columns.Add(this.gv_taskNo);
this.gridBand1.Columns.Add(this.gv_checkRes);
this.gridBand1.Columns.Add(this.gv_checkQty);
this.gridBand1.Columns.Add(this.gv_mmlist);
@@ -838,9 +703,7 @@
this.gridBand1.Columns.Add(this.gv_depotsCode);
this.gridBand1.Columns.Add(this.gv_transctionNo);
this.gridBand1.Columns.Add(this.gv_suppNo);
- this.gridBand1.Columns.Add(this.gv_factory);
this.gridBand1.Columns.Add(this.gv_sapstatus);
- this.gridBand1.Columns.Add(this.gv_sapno);
this.gridBand1.Columns.Add(this.gv_sapyear);
this.gridBand1.Columns.Add(this.gv_saptext);
this.gridBand1.Columns.Add(this.gv_ischeck);
@@ -849,7 +712,6 @@
this.gridBand1.Columns.Add(this.gv_company);
this.gridBand1.Columns.Add(this.gv_urgentFlag);
this.gridBand1.Columns.Add(this.gv_lineNo);
- this.gridBand1.Columns.Add(this.gv_mttransctionNo);
this.gridBand1.Columns.Add(this.gv_taskLino);
this.gridBand1.Columns.Add(this.gv_fbillno);
this.gridBand1.Columns.Add(this.gv_fbillLino);
@@ -858,7 +720,6 @@
this.gridBand1.Columns.Add(this.gv_iqcReleaseNo);
this.gridBand1.Columns.Add(this.gv_pickIns);
this.gridBand1.Columns.Add(this.gv_rbillNo);
- this.gridBand1.Columns.Add(this.gv_bgr);
this.gridBand1.MinWidth = 50;
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 0;
@@ -869,25 +730,13 @@
this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴 ";
- this.gv_status.FieldName = "status2";
+ this.gv_status.FieldName = "checkStatus";
this.gv_status.MinWidth = 25;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
this.gv_status.Width = 50;
- //
- // gv_fstatus
- //
- this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fstatus.Caption = "f鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴 ";
- this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MinWidth = 25;
- this.gv_fstatus.Name = "gv_fstatus";
- this.gv_fstatus.OptionsColumn.AllowEdit = false;
- this.gv_fstatus.Tag = "query_a.FSTATUS";
- this.gv_fstatus.Width = 94;
//
// gv_guid
//
@@ -937,30 +786,6 @@
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Width = 94;
//
- // gv_billTypeId
- //
- this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
- this.gv_billTypeId.Caption = "鍗曟嵁绫诲瀷ID ";
- this.gv_billTypeId.FieldName = "billTypeId";
- this.gv_billTypeId.MinWidth = 25;
- this.gv_billTypeId.Name = "gv_billTypeId";
- this.gv_billTypeId.OptionsColumn.AllowEdit = false;
- this.gv_billTypeId.Tag = "query_a.BILL_TYPE_ID";
- this.gv_billTypeId.Width = 94;
- //
- // gv_transactionId
- //
- this.gv_transactionId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_transactionId.AppearanceCell.Options.UseFont = true;
- this.gv_transactionId.Caption = "浜嬪姟绫诲瀷ID ";
- this.gv_transactionId.FieldName = "transactionId";
- this.gv_transactionId.MinWidth = 25;
- this.gv_transactionId.Name = "gv_transactionId";
- this.gv_transactionId.OptionsColumn.AllowEdit = false;
- this.gv_transactionId.Tag = "query_a.TRANSACTION_ID";
- this.gv_transactionId.Width = 94;
- //
// gv_userNoBack
//
this.gv_userNoBack.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -972,30 +797,6 @@
this.gv_userNoBack.OptionsColumn.AllowEdit = false;
this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
this.gv_userNoBack.Width = 94;
- //
- // gv_checkUser
- //
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 25;
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.CHECK_USER";
- this.gv_checkUser.Width = 94;
- //
- // gv_taskNo
- //
- this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_taskNo.AppearanceCell.Options.UseFont = true;
- this.gv_taskNo.Caption = "TASK_NO ";
- this.gv_taskNo.FieldName = "taskNo";
- this.gv_taskNo.MinWidth = 25;
- this.gv_taskNo.Name = "gv_taskNo";
- this.gv_taskNo.OptionsColumn.AllowEdit = false;
- this.gv_taskNo.Tag = "query_a.TASK_NO";
- this.gv_taskNo.Width = 94;
//
// gv_checkRes
//
@@ -1081,18 +882,6 @@
this.gv_suppNo.Tag = "query_a.SUPP_NO";
this.gv_suppNo.Width = 64;
//
- // gv_factory
- //
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "FACTORY ";
- this.gv_factory.FieldName = "factory";
- this.gv_factory.MinWidth = 25;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Tag = "query_a.FACTORY";
- this.gv_factory.Width = 94;
- //
// gv_sapstatus
//
this.gv_sapstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1104,18 +893,6 @@
this.gv_sapstatus.OptionsColumn.AllowEdit = false;
this.gv_sapstatus.Tag = "query_a.SAPSTATUS";
this.gv_sapstatus.Width = 94;
- //
- // gv_sapno
- //
- this.gv_sapno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_sapno.AppearanceCell.Options.UseFont = true;
- this.gv_sapno.Caption = "SAPNO ";
- this.gv_sapno.FieldName = "sapno";
- this.gv_sapno.MinWidth = 25;
- this.gv_sapno.Name = "gv_sapno";
- this.gv_sapno.OptionsColumn.AllowEdit = false;
- this.gv_sapno.Tag = "query_a.SAPNO";
- this.gv_sapno.Width = 64;
//
// gv_sapyear
//
@@ -1213,18 +990,6 @@
this.gv_lineNo.Tag = "query_a.LINE_NO";
this.gv_lineNo.Width = 64;
//
- // gv_mttransctionNo
- //
- this.gv_mttransctionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_mttransctionNo.AppearanceCell.Options.UseFont = true;
- this.gv_mttransctionNo.Caption = "鍐查攢浜嬪姟绫诲瀷缂栫爜 ";
- this.gv_mttransctionNo.FieldName = "mttransctionNo";
- this.gv_mttransctionNo.MinWidth = 25;
- this.gv_mttransctionNo.Name = "gv_mttransctionNo";
- this.gv_mttransctionNo.OptionsColumn.AllowEdit = false;
- this.gv_mttransctionNo.Tag = "query_a.MTTRANSCTION_NO";
- this.gv_mttransctionNo.Width = 64;
- //
// gv_taskLino
//
this.gv_taskLino.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1321,17 +1086,22 @@
this.gv_rbillNo.Tag = "query_a.RBILL_NO";
this.gv_rbillNo.Width = 64;
//
- // gv_bgr
+ // gridBand16
//
- this.gv_bgr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_bgr.AppearanceCell.Options.UseFont = true;
- this.gv_bgr.Caption = "鎶ュ伐浜� ";
- this.gv_bgr.FieldName = "bgr";
- this.gv_bgr.MinWidth = 25;
- this.gv_bgr.Name = "gv_bgr";
- this.gv_bgr.OptionsColumn.AllowEdit = false;
- this.gv_bgr.Tag = "query_a.BGR";
- this.gv_bgr.Width = 64;
+ this.gridBand16.Caption = "鍏ュ簱缁勭粐";
+ this.gridBand16.Columns.Add(this.bandedGridColumn3);
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 1;
+ this.gridBand16.Width = 94;
+ //
+ // bandedGridColumn3
+ //
+ this.bandedGridColumn3.Caption = "鍏ュ簱缁勭粐";
+ this.bandedGridColumn3.FieldName = "rkOrg";
+ this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.Name = "bandedGridColumn3";
+ this.bandedGridColumn3.Visible = true;
+ this.bandedGridColumn3.Width = 94;
//
// gridBand2
//
@@ -1339,7 +1109,7 @@
this.gridBand2.Columns.Add(this.gv_billNo);
this.gridBand2.MinWidth = 25;
this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.VisibleIndex = 2;
this.gridBand2.Width = 114;
//
// gv_billNo
@@ -1357,12 +1127,26 @@
//
// gridBand3
//
- this.gridBand3.Caption = "鍒拌揣鍗曞彿";
+ this.gridBand3.Caption = "鐢宠鍗曞彿";
+ this.gridBand3.Columns.Add(this.gv_taskNo);
this.gridBand3.Columns.Add(this.gv_cbillNo);
this.gridBand3.MinWidth = 25;
this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 114;
+ this.gridBand3.VisibleIndex = 3;
+ this.gridBand3.Width = 94;
+ //
+ // gv_taskNo
+ //
+ this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_taskNo.AppearanceCell.Options.UseFont = true;
+ this.gv_taskNo.Caption = "鐢宠鍗曞彿";
+ this.gv_taskNo.FieldName = "taskNo";
+ this.gv_taskNo.MinWidth = 25;
+ this.gv_taskNo.Name = "gv_taskNo";
+ this.gv_taskNo.OptionsColumn.AllowEdit = false;
+ this.gv_taskNo.Tag = "query_a.TASK_NO";
+ this.gv_taskNo.Visible = true;
+ this.gv_taskNo.Width = 94;
//
// gv_cbillNo
//
@@ -1374,8 +1158,41 @@
this.gv_cbillNo.Name = "gv_cbillNo";
this.gv_cbillNo.OptionsColumn.AllowEdit = false;
this.gv_cbillNo.Tag = "query_a.CBILL_NO";
- this.gv_cbillNo.Visible = true;
this.gv_cbillNo.Width = 114;
+ //
+ // gridBand17
+ //
+ this.gridBand17.Caption = "鍗曟嵁绫诲瀷";
+ this.gridBand17.Columns.Add(this.bandedGridColumn4);
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 4;
+ this.gridBand17.Width = 94;
+ //
+ // bandedGridColumn4
+ //
+ this.bandedGridColumn4.Caption = "鍗曟嵁绫诲瀷";
+ this.bandedGridColumn4.FieldName = "djlx";
+ this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.Name = "bandedGridColumn4";
+ this.bandedGridColumn4.Visible = true;
+ this.bandedGridColumn4.Width = 94;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "搴撳瓨鏂瑰悜";
+ this.gridBand18.Columns.Add(this.bandedGridColumn5);
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 5;
+ this.gridBand18.Width = 94;
+ //
+ // bandedGridColumn5
+ //
+ this.bandedGridColumn5.Caption = "搴撳瓨鏂瑰悜";
+ this.bandedGridColumn5.FieldName = "kcfx";
+ this.bandedGridColumn5.MinWidth = 25;
+ this.bandedGridColumn5.Name = "bandedGridColumn5";
+ this.bandedGridColumn5.Visible = true;
+ this.bandedGridColumn5.Width = 94;
//
// gridBand5
//
@@ -1383,7 +1200,7 @@
this.gridBand5.Columns.Add(this.gv_createBy);
this.gridBand5.MinWidth = 40;
this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 3;
+ this.gridBand5.VisibleIndex = 6;
this.gridBand5.Width = 66;
//
// gv_createBy
@@ -1405,7 +1222,7 @@
this.gridBand4.Columns.Add(this.gv_createDate);
this.gridBand4.MinWidth = 25;
this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 4;
+ this.gridBand4.VisibleIndex = 7;
this.gridBand4.Width = 146;
//
// gv_createDate
@@ -1421,21 +1238,42 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 146;
//
+ // gridBand15
+ //
+ this.gridBand15.Caption = "瀹℃牳浜�";
+ this.gridBand15.Columns.Add(this.gv_checkUser);
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 8;
+ this.gridBand15.Width = 94;
+ //
+ // gv_checkUser
+ //
+ this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUser.Caption = "瀹℃牳浜� ";
+ this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.CHECK_USER";
+ this.gv_checkUser.Visible = true;
+ this.gv_checkUser.Width = 94;
+ //
// gridBand6
//
- this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
+ this.gridBand6.Caption = "瀹℃牳鏃堕棿";
this.gridBand6.Columns.Add(this.gv_checkDate);
this.gridBand6.Columns.Add(this.gv_insDate);
this.gridBand6.MinWidth = 25;
this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 5;
+ this.gridBand6.VisibleIndex = 9;
this.gridBand6.Width = 94;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "CHECK_DATE ";
+ this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
@@ -1465,7 +1303,7 @@
this.gridBand10,
this.gridBand9});
this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 6;
+ this.gridBand7.VisibleIndex = 10;
this.gridBand7.Width = 183;
//
// gridBand10
@@ -1482,7 +1320,7 @@
this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱 ";
- this.gv_depotsId.FieldName = "depotsId";
+ this.gv_depotsId.FieldName = "ckNo";
this.gv_depotsId.MinWidth = 25;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
@@ -1502,7 +1340,7 @@
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
- this.bandedGridColumn1.FieldName = "depotName";
+ this.bandedGridColumn1.FieldName = "ckName";
this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
@@ -1517,7 +1355,8 @@
this.gridBand11,
this.gridBand12});
this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 7;
+ this.gridBand8.Visible = false;
+ this.gridBand8.VisibleIndex = -1;
this.gridBand8.Width = 183;
//
// gridBand11
@@ -1566,7 +1405,8 @@
this.gridBand13.Columns.Add(this.gv_paperBillNo);
this.gridBand13.MinWidth = 50;
this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 8;
+ this.gridBand13.Visible = false;
+ this.gridBand13.VisibleIndex = -1;
this.gridBand13.Width = 95;
//
// gv_paperBillNo
@@ -1588,7 +1428,7 @@
this.gridBand14.Columns.Add(this.gv_remark);
this.gridBand14.MinWidth = 50;
this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.VisibleIndex = 11;
this.gridBand14.Width = 119;
//
// gv_remark
@@ -1647,10 +1487,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 144);
+ this.tabMx.Location = new System.Drawing.Point(0, 176);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1346, 426);
+ this.tabMx.Size = new System.Drawing.Size(1346, 394);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -1659,17 +1499,29 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_ckName);
+ this.panel1.Controls.Add(this.textEdit1);
+ this.panel1.Controls.Add(this.labelControl6);
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.labelControl3);
+ this.panel1.Controls.Add(this.txt_lyfx);
+ this.panel1.Controls.Add(this.txt_hz);
+ this.panel1.Controls.Add(this.labelControl2);
+ this.panel1.Controls.Add(this.txt_hzlx);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_djlx);
+ this.panel1.Controls.Add(this.lb_djlx);
+ this.panel1.Controls.Add(this.txt_dptName);
+ this.panel1.Controls.Add(this.txt_gysName);
+ this.panel1.Controls.Add(this.lb_outPart);
+ this.panel1.Controls.Add(this.lb_taskNo);
+ this.panel1.Controls.Add(this.txt_kcOrg);
this.panel1.Controls.Add(this.txt_status);
- this.panel1.Controls.Add(this.txt_suppId);
- this.panel1.Controls.Add(this.txt_depotsId);
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_suppId);
this.panel1.Controls.Add(this.lb_cbillNo);
- this.panel1.Controls.Add(this.txt_cbillNo);
- this.panel1.Controls.Add(this.lb_paperBillNo);
- this.panel1.Controls.Add(this.txt_paperBillNo);
+ this.panel1.Controls.Add(this.txt_abtNo);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.lb_createDate);
@@ -1684,38 +1536,181 @@
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(1346, 144);
+ this.panel1.Size = new System.Drawing.Size(1346, 176);
this.panel1.TabIndex = 1;
+ //
+ // txt_ckName
+ //
+ this.txt_ckName.Location = new System.Drawing.Point(402, 109);
+ 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(188, 28);
+ this.txt_ckName.TabIndex = 609;
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(907, 15);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.textEdit1.Properties.Appearance.Options.UseFont = true;
+ this.textEdit1.Size = new System.Drawing.Size(151, 28);
+ this.textEdit1.TabIndex = 608;
+ //
+ // labelControl6
+ //
+ this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl6.Appearance.Options.UseFont = true;
+ this.labelControl6.Location = new System.Drawing.Point(852, 19);
+ this.labelControl6.Name = "labelControl6";
+ this.labelControl6.Size = new System.Drawing.Size(51, 21);
+ this.labelControl6.TabIndex = 607;
+ this.labelControl6.Text = "瀹℃牳浜�";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(347, 81);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(51, 21);
+ this.labelControl5.TabIndex = 606;
+ this.labelControl5.Text = "渚涘簲鍟�";
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(601, 50);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(68, 21);
+ this.labelControl3.TabIndex = 603;
+ this.labelControl3.Text = "搴撳瓨鏂瑰悜";
+ //
+ // txt_lyfx
+ //
+ this.txt_lyfx.Location = new System.Drawing.Point(673, 46);
+ this.txt_lyfx.Name = "txt_lyfx";
+ this.txt_lyfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_lyfx.Properties.Appearance.Options.UseFont = true;
+ this.txt_lyfx.Size = new System.Drawing.Size(156, 28);
+ this.txt_lyfx.TabIndex = 604;
+ //
+ // txt_hz
+ //
+ this.txt_hz.Location = new System.Drawing.Point(90, 109);
+ this.txt_hz.Name = "txt_hz";
+ this.txt_hz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_hz.Properties.Appearance.Options.UseFont = true;
+ this.txt_hz.Size = new System.Drawing.Size(232, 28);
+ this.txt_hz.TabIndex = 602;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(50, 113);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(34, 21);
+ this.labelControl2.TabIndex = 601;
+ this.labelControl2.Text = "璐т富";
+ //
+ // txt_hzlx
+ //
+ this.txt_hzlx.Location = new System.Drawing.Point(90, 77);
+ this.txt_hzlx.Name = "txt_hzlx";
+ this.txt_hzlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_hzlx.Properties.Appearance.Options.UseFont = true;
+ this.txt_hzlx.Size = new System.Drawing.Size(232, 28);
+ this.txt_hzlx.TabIndex = 600;
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(16, 81);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(68, 21);
+ this.labelControl4.TabIndex = 599;
+ this.labelControl4.Text = "璐т富绫诲瀷";
+ //
+ // txt_djlx
+ //
+ this.txt_djlx.Location = new System.Drawing.Point(673, 15);
+ this.txt_djlx.Name = "txt_djlx";
+ this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_djlx.Properties.Appearance.Options.UseFont = true;
+ this.txt_djlx.Size = new System.Drawing.Size(156, 28);
+ this.txt_djlx.TabIndex = 598;
+ //
+ // lb_djlx
+ //
+ this.lb_djlx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_djlx.Appearance.Options.UseFont = true;
+ this.lb_djlx.Location = new System.Drawing.Point(601, 19);
+ this.lb_djlx.Name = "lb_djlx";
+ this.lb_djlx.Size = new System.Drawing.Size(68, 21);
+ this.lb_djlx.TabIndex = 597;
+ this.lb_djlx.Text = "鍗曟嵁绫诲瀷";
+ //
+ // txt_dptName
+ //
+ this.txt_dptName.Location = new System.Drawing.Point(402, 46);
+ 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(188, 28);
+ this.txt_dptName.TabIndex = 596;
+ //
+ // txt_gysName
+ //
+ this.txt_gysName.Location = new System.Drawing.Point(402, 77);
+ this.txt_gysName.Name = "txt_gysName";
+ this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_gysName.Properties.Appearance.Options.UseFont = true;
+ this.txt_gysName.Size = new System.Drawing.Size(188, 28);
+ this.txt_gysName.TabIndex = 595;
+ //
+ // lb_outPart
+ //
+ this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_outPart.Appearance.Options.UseFont = true;
+ this.lb_outPart.Location = new System.Drawing.Point(364, 50);
+ this.lb_outPart.Name = "lb_outPart";
+ this.lb_outPart.Size = new System.Drawing.Size(34, 21);
+ this.lb_outPart.TabIndex = 594;
+ this.lb_outPart.Text = "閮ㄩ棬";
+ //
+ // lb_taskNo
+ //
+ this.lb_taskNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_taskNo.Appearance.Options.UseFont = true;
+ this.lb_taskNo.Location = new System.Drawing.Point(16, 50);
+ this.lb_taskNo.Name = "lb_taskNo";
+ this.lb_taskNo.Size = new System.Drawing.Size(68, 21);
+ this.lb_taskNo.TabIndex = 592;
+ this.lb_taskNo.Text = "搴撳瓨缁勭粐";
+ //
+ // txt_kcOrg
+ //
+ this.txt_kcOrg.Location = new System.Drawing.Point(90, 46);
+ this.txt_kcOrg.Name = "txt_kcOrg";
+ this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
+ this.txt_kcOrg.Size = new System.Drawing.Size(232, 28);
+ this.txt_kcOrg.TabIndex = 593;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(896, 24);
+ this.txt_status.Location = new System.Drawing.Point(907, 79);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "";
this.txt_status.Size = new System.Drawing.Size(48, 24);
this.txt_status.TabIndex = 591;
//
- // txt_suppId
- //
- this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(100, 57);
- this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(228, 30);
- this.txt_suppId.TabIndex = 590;
- //
- // txt_depotsId
- //
- this.txt_depotsId.IsReadly = false;
- this.txt_depotsId.Location = new System.Drawing.Point(100, 97);
- this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_depotsId.Name = "txt_depotsId";
- this.txt_depotsId.Size = new System.Drawing.Size(228, 30);
- this.txt_depotsId.TabIndex = 589;
- //
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(896, 61);
+ this.txt_checkDate.Location = new System.Drawing.Point(907, 46);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -1726,7 +1721,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(810, 65);
+ this.labelControl1.Location = new System.Drawing.Point(835, 50);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 586;
@@ -1735,7 +1730,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(844, 68);
+ this.lbGuid.Location = new System.Drawing.Point(871, 50);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1768,8 +1763,7 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -1784,6 +1778,15 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1800,26 +1803,12 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemInId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebeln;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1rbillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemSname;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
@@ -1828,17 +1817,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1cItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraEditors.LabelControl lb_suppId;
private DevExpress.XtraEditors.LabelControl lb_cbillNo;
- private DevExpress.XtraEditors.TextEdit txt_cbillNo;
-
- private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
- private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraEditors.TextEdit txt_abtNo;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1865,8 +1849,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_billTypeId;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_transactionId;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_paperBillNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_userNoBack;
@@ -1881,10 +1863,7 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsCode;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_transctionNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fstatus;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_factory;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_sapstatus;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_sapno;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_sapyear;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_saptext;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ischeck;
@@ -1893,7 +1872,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_company;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_urgentFlag;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lineNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_mttransctionNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_taskLino;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillno;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillLino;
@@ -1903,21 +1881,25 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cbillNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_pickIns;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_rbillNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_bgr;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppId;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
- private UserControl.UcLookSupplier txt_suppId;
- private UserControl.UcLookCk txt_depotsId;
private DevExpress.XtraEditors.CheckEdit txt_status;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn3;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn4;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn5;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
@@ -1927,5 +1909,28 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.TextEdit txt_lyfx;
+ private DevExpress.XtraEditors.TextEdit txt_hz;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.TextEdit txt_hzlx;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.TextEdit txt_djlx;
+ private DevExpress.XtraEditors.LabelControl lb_djlx;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
+ private DevExpress.XtraEditors.TextEdit txt_gysName;
+ private DevExpress.XtraEditors.LabelControl lb_outPart;
+ private DevExpress.XtraEditors.LabelControl lb_taskNo;
+ private DevExpress.XtraEditors.TextEdit txt_kcOrg;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.LabelControl labelControl6;
+ private DevExpress.XtraEditors.TextEdit txt_ckName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index 8d04e64..8c72bc1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -25,7 +25,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status2", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -297,7 +297,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "status2", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 0134448..8578480 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -41,6 +41,8 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -72,8 +74,6 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -273,6 +273,26 @@
this.gv_checkStatus.Visible = true;
this.gv_checkStatus.VisibleIndex = 0;
this.gv_checkStatus.Width = 50;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹℃牳鑰�";
+ this.gridColumn1.FieldName = "checkBy";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹℃牳鏃ユ湡";
+ this.gridColumn2.FieldName = "checkDate";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.Width = 94;
//
// xtraTabControl1
//
@@ -483,7 +503,6 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txxtItem4.Properties.Items.AddRange(new object[] {
"<鏃�>",
- "<缁勭粐缂栧彿>",
"<骞村勾>",
"<骞村勾骞村勾>",
"<鏈堟湀>",
@@ -503,7 +522,6 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txxtItem3.Properties.Items.AddRange(new object[] {
"<鏃�>",
- "<缁勭粐缂栧彿>",
"<骞村勾>",
"<骞村勾骞村勾>",
"<鏈堟湀>",
@@ -537,7 +555,6 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txxtItem2.Properties.Items.AddRange(new object[] {
"<鏃�>",
- "<缁勭粐缂栧彿>",
"<骞村勾>",
"<骞村勾骞村勾>",
"<鏈堟湀>",
@@ -568,7 +585,6 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txxtItem1.Properties.Items.AddRange(new object[] {
"<鏃�>",
- "<缁勭粐缂栧彿>",
"<骞村勾>",
"<骞村勾骞村勾>",
"<鏈堟湀>",
@@ -688,26 +704,6 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "瀹℃牳鑰�";
- this.gridColumn1.FieldName = "checkBy";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "瀹℃牳鏃ユ湡";
- this.gridColumn2.FieldName = "checkDate";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 10;
- this.gridColumn2.Width = 94;
//
// DocNoRule
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 9f90aff..a33b101 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -390,6 +390,7 @@
dataTable.Rows.Add("FQC(鍏ュ簱妫�楠�)");
dataTable.Rows.Add("OQCSQ(鍑哄簱妫�楠岀敵璇�)");
dataTable.Rows.Add("OQC(鍑哄簱妫�楠�)");
+ dataTable.Rows.Add("TM(鏉＄爜)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index cd640a1..4c31de6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -29,25 +29,21 @@
/// </summary>
private void InitializeComponent()
{
- this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_suppId = new DevExpress.XtraEditors.LabelControl();
this.lb_cbillNo = new DevExpress.XtraEditors.LabelControl();
this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
this.lb_paperBillNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
@@ -61,23 +57,17 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
- this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn7 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_reason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_userNoBack = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_taskNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_mmlist = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_ebeln = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_transctionNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_sapstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_ischeck = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_insby = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_isVisual = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lineNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_taskLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -86,25 +76,41 @@
this.gv_custNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_custName = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_iqcReleaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_pickIns = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_rbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_bgr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_depotsId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_suppId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_paperBillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -114,51 +120,41 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1rbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_scOrg = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckUser = new DevExpress.XtraEditors.TextEdit();
- this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
- this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_rkOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -175,71 +171,18 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
- //
- // gvMx2itemId
- //
- this.gvMx2itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemId.Caption = "鐗╂枡ID";
- this.gvMx2itemId.FieldName = "itemId";
- this.gvMx2itemId.Name = "gvMx2itemId";
- this.gvMx2itemId.Tag = "query_a.ITEM_ID";
- this.gvMx2itemId.Width = 94;
- //
- // gvMx2lineK3id
- //
- this.gvMx2lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx2lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
- this.gvMx2lineK3id.FieldName = "lineK3id";
- this.gvMx2lineK3id.Name = "gvMx2lineK3id";
- this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx2lineK3id.Visible = true;
- this.gvMx2lineK3id.VisibleIndex = 8;
- this.gvMx2lineK3id.Width = 94;
- //
- // gvMx2ebelnK3id
- //
- this.gvMx2ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx2ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
- this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
- this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx2ebelnK3id.Visible = true;
- this.gvMx2ebelnK3id.VisibleIndex = 7;
- this.gvMx2ebelnK3id.Width = 94;
- //
- // gvMx2workNo
- //
- this.gvMx2workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx2workNo.Caption = "浠诲姟鍗曡鍙�";
- this.gvMx2workNo.FieldName = "workLine";
- this.gvMx2workNo.Name = "gvMx2workNo";
- this.gvMx2workNo.Tag = "query_a.WORK_NO";
- this.gvMx2workNo.Visible = true;
- this.gvMx2workNo.VisibleIndex = 6;
- this.gvMx2workNo.Width = 94;
- //
- // gvMx2ebeln
- //
- this.gvMx2ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx2ebeln.Caption = "閲囪喘璁㈠崟";
- this.gvMx2ebeln.FieldName = "ebeln";
- this.gvMx2ebeln.Name = "gvMx2ebeln";
- this.gvMx2ebeln.Tag = "query_a.EBELN";
- this.gvMx2ebeln.Visible = true;
- this.gvMx2ebeln.VisibleIndex = 5;
- this.gvMx2ebeln.Width = 94;
//
// gvMx2unit
//
@@ -277,22 +220,11 @@
this.gvMx2quantity.VisibleIndex = 3;
this.gvMx2quantity.Width = 94;
//
- // gvMx2guid
- //
- this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid";
- this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
- this.gvMx2guid.Name = "gvMx2guid";
- this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
- //
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 411);
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 352);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
@@ -301,7 +233,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(1344, 411);
+ this.gcMx1.Size = new System.Drawing.Size(1344, 352);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -309,17 +241,13 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx2guid,
- this.gvMx2itemId,
this.gridColumn2,
this.gvMx2itemSname,
this.gridColumn1,
this.gvMx2quantity,
this.gvMx2unit,
- this.gvMx2ebeln,
- this.gvMx2workNo,
- this.gvMx2ebelnK3id,
- this.gvMx2lineK3id});
+ this.gridColumn5,
+ this.gridColumn6});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -344,59 +272,79 @@
this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鑰�";
+ this.gridColumn5.FieldName = "createBy";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn6.FieldName = "createDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
+ //
// lb_suppId
//
this.lb_suppId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppId.Appearance.Options.UseFont = true;
- this.lb_suppId.Location = new System.Drawing.Point(9, 57);
+ this.lb_suppId.Location = new System.Drawing.Point(268, 23);
this.lb_suppId.Name = "lb_suppId";
- this.lb_suppId.Size = new System.Drawing.Size(85, 21);
+ this.lb_suppId.Size = new System.Drawing.Size(68, 21);
this.lb_suppId.TabIndex = 585;
- this.lb_suppId.Text = "渚涘簲鍟嗗悕绉�";
+ this.lb_suppId.Text = "鍏ュ簱缁勭粐";
//
// lb_cbillNo
//
this.lb_cbillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_cbillNo.Appearance.Options.UseFont = true;
- this.lb_cbillNo.Location = new System.Drawing.Point(335, 23);
+ this.lb_cbillNo.Location = new System.Drawing.Point(26, 56);
this.lb_cbillNo.Name = "lb_cbillNo";
this.lb_cbillNo.Size = new System.Drawing.Size(68, 21);
this.lb_cbillNo.TabIndex = 507;
- this.lb_cbillNo.Text = "鍒拌揣鍗曞彿";
+ this.lb_cbillNo.Text = "宸ュ崟鍗曞彿";
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(408, 19);
+ this.txt_cbillNo.Location = new System.Drawing.Point(99, 52);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_cbillNo.Size = new System.Drawing.Size(163, 28);
this.txt_cbillNo.TabIndex = 507;
//
// lb_paperBillNo
//
this.lb_paperBillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_paperBillNo.Appearance.Options.UseFont = true;
- this.lb_paperBillNo.Location = new System.Drawing.Point(335, 57);
+ this.lb_paperBillNo.Location = new System.Drawing.Point(26, 88);
this.lb_paperBillNo.Name = "lb_paperBillNo";
this.lb_paperBillNo.Size = new System.Drawing.Size(68, 21);
this.lb_paperBillNo.TabIndex = 243;
- this.lb_paperBillNo.Text = "閫佽揣鍗曞彿";
+ this.lb_paperBillNo.Text = "浠诲姟鍗曞彿";
//
- // txt_paperBillNo
+ // txt_workNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(408, 53);
- this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(150, 28);
- this.txt_paperBillNo.TabIndex = 243;
+ this.txt_workNo.Location = new System.Drawing.Point(99, 84);
+ this.txt_workNo.Name = "txt_workNo";
+ this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_workNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_workNo.Size = new System.Drawing.Size(163, 28);
+ this.txt_workNo.TabIndex = 243;
//
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(369, 91);
+ this.lb_remark.Location = new System.Drawing.Point(60, 154);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(34, 21);
this.lb_remark.TabIndex = 240;
@@ -404,18 +352,18 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(408, 87);
+ this.txt_remark.Location = new System.Drawing.Point(99, 150);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(400, 28);
+ this.txt_remark.Size = new System.Drawing.Size(487, 28);
this.txt_remark.TabIndex = 240;
//
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(568, 57);
+ this.lb_createDate.Location = new System.Drawing.Point(592, 56);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(68, 21);
this.lb_createDate.TabIndex = 222;
@@ -423,18 +371,18 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(639, 53);
+ this.txt_createDate.Location = new System.Drawing.Point(663, 52);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(167, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(156, 28);
this.txt_createDate.TabIndex = 222;
//
// lb_createBy
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(585, 23);
+ this.lb_createBy.Location = new System.Drawing.Point(609, 23);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(51, 21);
this.lb_createBy.TabIndex = 219;
@@ -442,18 +390,18 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(639, 19);
+ this.txt_createBy.Location = new System.Drawing.Point(663, 19);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(167, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(156, 28);
this.txt_createBy.TabIndex = 219;
//
// lb_depotsId
//
this.lb_depotsId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotsId.Appearance.Options.UseFont = true;
- this.lb_depotsId.Location = new System.Drawing.Point(26, 91);
+ this.lb_depotsId.Location = new System.Drawing.Point(592, 88);
this.lb_depotsId.Name = "lb_depotsId";
this.lb_depotsId.Size = new System.Drawing.Size(68, 21);
this.lb_depotsId.TabIndex = 216;
@@ -463,7 +411,7 @@
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(814, 91);
+ this.lb_status.Location = new System.Drawing.Point(825, 88);
this.lb_status.Name = "lb_status";
this.lb_status.Size = new System.Drawing.Size(68, 21);
this.lb_status.TabIndex = 213;
@@ -485,7 +433,7 @@
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(228, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(163, 28);
this.txt_billNo.TabIndex = 211;
//
// toolBarMenu1
@@ -522,8 +470,11 @@
this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
this.gridBand1,
this.gridBand16,
+ this.gridBand17,
this.gridBand2,
this.gridBand3,
+ this.gridBand18,
+ this.gridBand19,
this.gridBand5,
this.gridBand4,
this.gridBand15,
@@ -542,23 +493,14 @@
this.gv_lastupdateDate,
this.gv_remark,
this.gv_paperBillNo,
- this.gv_userNoBack,
this.gv_checkUser,
this.gv_checkDate,
this.gv_taskNo,
- this.gv_insDate,
this.gv_checkRes,
this.gv_checkQty,
this.gv_mmlist,
this.gv_ebeln,
this.gv_depotsCode,
- this.gv_transctionNo,
- this.gv_fstatus,
- this.gv_factory,
- this.gv_sapstatus,
- this.gv_ischeck,
- this.gv_insby,
- this.gv_isVisual,
this.gv_urgentFlag,
this.gv_lineNo,
this.gv_taskLino,
@@ -568,16 +510,16 @@
this.gv_custName,
this.gv_iqcReleaseNo,
this.gv_cbillNo,
- this.gv_pickIns,
- this.gv_fcheckUser,
- this.gv_fcheckDate,
this.gv_rbillNo,
this.gv_bgr,
- this.gv_suppId,
this.bandedGridColumn1,
- this.gv_suppNo,
this.gv_depotsId,
- this.bandedGridColumn2});
+ this.bandedGridColumn2,
+ this.bandedGridColumn3,
+ this.bandedGridColumn4,
+ this.bandedGridColumn5,
+ this.bandedGridColumn6,
+ this.bandedGridColumn7});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -586,17 +528,45 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_fstatus
+ // gridBand1
//
- this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fstatus.Caption = "f鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴 ";
- this.gv_fstatus.FieldName = "checkStatus";
- this.gv_fstatus.Name = "gv_fstatus";
- this.gv_fstatus.OptionsColumn.AllowEdit = false;
- this.gv_fstatus.Tag = "query_a.FSTATUS";
- this.gv_fstatus.Visible = true;
- this.gv_fstatus.Width = 50;
+ this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand1.Caption = "瀹℃牳鏍囪瘑";
+ this.gridBand1.Columns.Add(this.bandedGridColumn7);
+ this.gridBand1.Columns.Add(this.gv_guid);
+ this.gridBand1.Columns.Add(this.gv_reason);
+ this.gridBand1.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand1.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand1.Columns.Add(this.gv_taskNo);
+ this.gridBand1.Columns.Add(this.gv_checkRes);
+ this.gridBand1.Columns.Add(this.gv_checkQty);
+ this.gridBand1.Columns.Add(this.gv_mmlist);
+ this.gridBand1.Columns.Add(this.gv_ebeln);
+ this.gridBand1.Columns.Add(this.gv_urgentFlag);
+ this.gridBand1.Columns.Add(this.gv_lineNo);
+ this.gridBand1.Columns.Add(this.gv_taskLino);
+ this.gridBand1.Columns.Add(this.gv_fbillno);
+ this.gridBand1.Columns.Add(this.gv_fbillLino);
+ this.gridBand1.Columns.Add(this.gv_custNo);
+ this.gridBand1.Columns.Add(this.gv_custName);
+ this.gridBand1.Columns.Add(this.gv_iqcReleaseNo);
+ this.gridBand1.Columns.Add(this.gv_rbillNo);
+ this.gridBand1.Columns.Add(this.gv_bgr);
+ this.gridBand1.MinWidth = 50;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 94;
+ //
+ // bandedGridColumn7
+ //
+ this.bandedGridColumn7.Caption = "瀹℃牳";
+ this.bandedGridColumn7.FieldName = "checkStatus";
+ this.bandedGridColumn7.MinWidth = 25;
+ this.bandedGridColumn7.Name = "bandedGridColumn7";
+ this.bandedGridColumn7.Tag = "query_a.BILL_NO";
+ this.bandedGridColumn7.Visible = true;
+ this.bandedGridColumn7.Width = 94;
//
// gv_guid
//
@@ -642,17 +612,6 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Width = 94;
- //
- // gv_userNoBack
- //
- this.gv_userNoBack.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_userNoBack.AppearanceCell.Options.UseFont = true;
- this.gv_userNoBack.Caption = "閫�鏂欎汉宸ュ彿 ";
- this.gv_userNoBack.FieldName = "userNoBack";
- this.gv_userNoBack.Name = "gv_userNoBack";
- this.gv_userNoBack.OptionsColumn.AllowEdit = false;
- this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
- this.gv_userNoBack.Width = 94;
//
// gv_taskNo
//
@@ -708,72 +667,6 @@
this.gv_ebeln.OptionsColumn.AllowEdit = false;
this.gv_ebeln.Tag = "query_a.EBELN";
this.gv_ebeln.Width = 64;
- //
- // gv_transctionNo
- //
- this.gv_transctionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_transctionNo.AppearanceCell.Options.UseFont = true;
- this.gv_transctionNo.Caption = "TRANSCTION_NO ";
- this.gv_transctionNo.FieldName = "transctionNo";
- this.gv_transctionNo.Name = "gv_transctionNo";
- this.gv_transctionNo.OptionsColumn.AllowEdit = false;
- this.gv_transctionNo.Tag = "query_a.TRANSCTION_NO";
- this.gv_transctionNo.Width = 94;
- //
- // gv_factory
- //
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "FACTORY ";
- this.gv_factory.FieldName = "factory";
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Tag = "query_a.FACTORY";
- this.gv_factory.Width = 94;
- //
- // gv_sapstatus
- //
- this.gv_sapstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_sapstatus.AppearanceCell.Options.UseFont = true;
- this.gv_sapstatus.Caption = "SAPSTATUS ";
- this.gv_sapstatus.FieldName = "sapstatus";
- this.gv_sapstatus.Name = "gv_sapstatus";
- this.gv_sapstatus.OptionsColumn.AllowEdit = false;
- this.gv_sapstatus.Tag = "query_a.SAPSTATUS";
- this.gv_sapstatus.Width = 94;
- //
- // gv_ischeck
- //
- this.gv_ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ischeck.AppearanceCell.Options.UseFont = true;
- this.gv_ischeck.Caption = "ISCHECK ";
- this.gv_ischeck.FieldName = "ischeck";
- this.gv_ischeck.Name = "gv_ischeck";
- this.gv_ischeck.OptionsColumn.AllowEdit = false;
- this.gv_ischeck.Tag = "query_a.ISCHECK";
- this.gv_ischeck.Width = 94;
- //
- // gv_insby
- //
- this.gv_insby.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_insby.AppearanceCell.Options.UseFont = true;
- this.gv_insby.Caption = "INSBY ";
- this.gv_insby.FieldName = "insby";
- this.gv_insby.Name = "gv_insby";
- this.gv_insby.OptionsColumn.AllowEdit = false;
- this.gv_insby.Tag = "query_a.INSBY";
- this.gv_insby.Width = 94;
- //
- // gv_isVisual
- //
- this.gv_isVisual.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isVisual.AppearanceCell.Options.UseFont = true;
- this.gv_isVisual.Caption = "IS_VISUAL ";
- this.gv_isVisual.FieldName = "isVisual";
- this.gv_isVisual.Name = "gv_isVisual";
- this.gv_isVisual.OptionsColumn.AllowEdit = false;
- this.gv_isVisual.Tag = "query_a.IS_VISUAL";
- this.gv_isVisual.Width = 94;
//
// gv_urgentFlag
//
@@ -863,28 +756,6 @@
this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO";
this.gv_iqcReleaseNo.Width = 64;
//
- // gv_pickIns
- //
- this.gv_pickIns.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_pickIns.AppearanceCell.Options.UseFont = true;
- this.gv_pickIns.Caption = "0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� ";
- this.gv_pickIns.FieldName = "pickIns";
- this.gv_pickIns.Name = "gv_pickIns";
- this.gv_pickIns.OptionsColumn.AllowEdit = false;
- this.gv_pickIns.Tag = "query_a.PICK_INS";
- this.gv_pickIns.Width = 64;
- //
- // gv_fcheckUser
- //
- this.gv_fcheckUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckUser.Caption = "鍏ュ簱瀹℃牳浜� ";
- this.gv_fcheckUser.FieldName = "fcheckUser";
- this.gv_fcheckUser.Name = "gv_fcheckUser";
- this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
- this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
- this.gv_fcheckUser.Width = 64;
- //
// gv_rbillNo
//
this.gv_rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -907,14 +778,48 @@
this.gv_bgr.Tag = "query_a.BGR";
this.gv_bgr.Width = 64;
//
+ // gridBand16
+ //
+ this.gridBand16.Caption = "鍏ュ簱缁勭粐";
+ this.gridBand16.Columns.Add(this.bandedGridColumn2);
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 1;
+ this.gridBand16.Width = 250;
+ //
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
- this.bandedGridColumn2.FieldName = "receivingOrg";
+ this.bandedGridColumn2.FieldName = "rkOrg";
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.Width = 250;
+ //
+ // gridBand17
+ //
+ this.gridBand17.Caption = "鐢熶骇缁勭粐";
+ this.gridBand17.Columns.Add(this.bandedGridColumn3);
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 2;
+ this.gridBand17.Width = 94;
+ //
+ // bandedGridColumn3
+ //
+ this.bandedGridColumn3.Caption = "鐢熶骇缁勭粐";
+ this.bandedGridColumn3.FieldName = "scOrg";
+ this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.Name = "bandedGridColumn3";
+ this.bandedGridColumn3.Visible = true;
+ this.bandedGridColumn3.Width = 94;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鍏ュ簱鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 20;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 3;
+ this.gridBand2.Width = 180;
//
// gv_billNo
//
@@ -928,6 +833,25 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 180;
//
+ // gridBand3
+ //
+ this.gridBand3.Caption = "鐗╂枡缂栫爜";
+ this.gridBand3.Columns.Add(this.bandedGridColumn4);
+ this.gridBand3.Columns.Add(this.gv_cbillNo);
+ this.gridBand3.MinWidth = 20;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 4;
+ this.gridBand3.Width = 94;
+ //
+ // bandedGridColumn4
+ //
+ this.bandedGridColumn4.Caption = "鐗╂枡缂栫爜";
+ this.bandedGridColumn4.FieldName = "itemNo";
+ this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.Name = "bandedGridColumn4";
+ this.bandedGridColumn4.Visible = true;
+ this.bandedGridColumn4.Width = 94;
+ //
// gv_cbillNo
//
this.gv_cbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -937,8 +861,50 @@
this.gv_cbillNo.Name = "gv_cbillNo";
this.gv_cbillNo.OptionsColumn.AllowEdit = false;
this.gv_cbillNo.Tag = "query_a.CBILL_NO";
- this.gv_cbillNo.Visible = true;
this.gv_cbillNo.Width = 180;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "鐗╂枡鍚嶇О";
+ this.gridBand18.Columns.Add(this.bandedGridColumn5);
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 5;
+ this.gridBand18.Width = 94;
+ //
+ // bandedGridColumn5
+ //
+ this.bandedGridColumn5.Caption = "鐗╂枡鍚嶇О";
+ this.bandedGridColumn5.FieldName = "itemName";
+ this.bandedGridColumn5.MinWidth = 25;
+ this.bandedGridColumn5.Name = "bandedGridColumn5";
+ this.bandedGridColumn5.Visible = true;
+ this.bandedGridColumn5.Width = 94;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "瑙勬牸鍨嬪彿";
+ this.gridBand19.Columns.Add(this.bandedGridColumn6);
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 6;
+ this.gridBand19.Width = 94;
+ //
+ // bandedGridColumn6
+ //
+ this.bandedGridColumn6.Caption = "瑙勬牸鍨嬪彿";
+ this.bandedGridColumn6.FieldName = "itemName";
+ this.bandedGridColumn6.MinWidth = 25;
+ this.bandedGridColumn6.Name = "bandedGridColumn6";
+ this.bandedGridColumn6.Visible = true;
+ this.bandedGridColumn6.Width = 94;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鍒涘缓浜�";
+ this.gridBand5.Columns.Add(this.gv_createBy);
+ this.gridBand5.MinWidth = 50;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 7;
+ this.gridBand5.Width = 80;
//
// gv_createBy
//
@@ -952,6 +918,15 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 80;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鍒涘缓鏃堕棿";
+ this.gridBand4.Columns.Add(this.gv_createDate);
+ this.gridBand4.MinWidth = 20;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 8;
+ this.gridBand4.Width = 180;
+ //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -963,6 +938,15 @@
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "瀹℃牳浜�";
+ this.gridBand15.Columns.Add(this.gv_checkUser);
+ this.gridBand15.MinWidth = 50;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 9;
+ this.gridBand15.Width = 60;
//
// gv_checkUser
//
@@ -976,11 +960,20 @@
this.gv_checkUser.Visible = true;
this.gv_checkUser.Width = 60;
//
+ // gridBand6
+ //
+ this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
+ this.gridBand6.Columns.Add(this.gv_checkDate);
+ this.gridBand6.MinWidth = 50;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 10;
+ this.gridBand6.Width = 180;
+ //
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "CHECK_DATE ";
+ this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
@@ -988,29 +981,26 @@
this.gv_checkDate.Visible = true;
this.gv_checkDate.Width = 180;
//
- // gv_insDate
+ // gridBand7
//
- this.gv_insDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_insDate.AppearanceCell.Options.UseFont = true;
- this.gv_insDate.Caption = "insDate瀹℃牳鏃ユ湡";
- this.gv_insDate.FieldName = "insDate";
- this.gv_insDate.Name = "gv_insDate";
- this.gv_insDate.OptionsColumn.AllowEdit = false;
- this.gv_insDate.RowIndex = 1;
- this.gv_insDate.Tag = "query_a.INS_DATE";
- this.gv_insDate.Width = 64;
+ this.gridBand7.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand7.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand7.Caption = "鏀惰揣浠�";
+ this.gridBand7.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand10,
+ this.gridBand9});
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 11;
+ this.gridBand7.Width = 200;
//
- // gv_fcheckDate
+ // gridBand10
//
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "鍏ュ簱瀹℃牳鏃ユ湡 ";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.RowIndex = 1;
- this.gv_fcheckDate.Tag = "query_a.FCHECK_DATE";
- this.gv_fcheckDate.Width = 138;
+ this.gridBand10.Caption = "浠撳簱缂栧彿";
+ this.gridBand10.Columns.Add(this.bandedGridColumn1);
+ this.gridBand10.MinWidth = 20;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 100;
//
// bandedGridColumn1
//
@@ -1019,6 +1009,16 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 100;
+ //
+ // gridBand9
+ //
+ this.gridBand9.Caption = "浠撳簱鍚嶇О";
+ this.gridBand9.Columns.Add(this.gv_depotsId);
+ this.gridBand9.Columns.Add(this.gv_depotsCode);
+ this.gridBand9.MinWidth = 20;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 1;
+ this.gridBand9.Width = 100;
//
// gv_depotsId
//
@@ -1043,29 +1043,44 @@
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
this.gv_depotsCode.Width = 94;
//
- // gv_suppNo
+ // gridBand8
//
- this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
- this.gv_suppNo.FieldName = "supNo";
- this.gv_suppNo.Name = "gv_suppNo";
- this.gv_suppNo.OptionsColumn.AllowEdit = false;
- this.gv_suppNo.Tag = "query_a.SUPP_NO";
- this.gv_suppNo.Visible = true;
- this.gv_suppNo.Width = 100;
+ this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand8.Caption = "渚涘簲鍟�";
+ this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand11,
+ this.gridBand12});
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.Visible = false;
+ this.gridBand8.VisibleIndex = -1;
+ this.gridBand8.Width = 250;
//
- // gv_suppId
+ // gridBand11
//
- this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_suppId.FieldName = "supName";
- this.gv_suppId.Name = "gv_suppId";
- this.gv_suppId.OptionsColumn.AllowEdit = false;
- this.gv_suppId.Tag = "query_a.SUPP_ID";
- this.gv_suppId.Visible = true;
- this.gv_suppId.Width = 150;
+ this.gridBand11.Caption = "渚涘簲鍟嗙紪鍙�";
+ this.gridBand11.MinWidth = 20;
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 100;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand12.MinWidth = 20;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 1;
+ this.gridBand12.Width = 150;
+ //
+ // gridBand13
+ //
+ this.gridBand13.Caption = "閫佽揣鍗曞彿";
+ this.gridBand13.Columns.Add(this.gv_paperBillNo);
+ this.gridBand13.MinWidth = 50;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.Visible = false;
+ this.gridBand13.VisibleIndex = -1;
+ this.gridBand13.Width = 120;
//
// gv_paperBillNo
//
@@ -1078,6 +1093,15 @@
this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
this.gv_paperBillNo.Visible = true;
this.gv_paperBillNo.Width = 120;
+ //
+ // gridBand14
+ //
+ this.gridBand14.Caption = "澶囨敞淇℃伅";
+ this.gridBand14.Columns.Add(this.gv_remark);
+ this.gridBand14.MinWidth = 60;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 12;
+ this.gridBand14.Width = 120;
//
// gv_remark
//
@@ -1134,10 +1158,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 127);
+ this.tabMx.Location = new System.Drawing.Point(0, 186);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1346, 443);
+ this.tabMx.Size = new System.Drawing.Size(1346, 384);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -1147,7 +1171,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1344, 411);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1344, 352);
this.xtraTabPage3.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
@@ -1156,7 +1180,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1344, 411);
+ this.gcMx2.Size = new System.Drawing.Size(1344, 352);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1164,49 +1188,21 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gvMx1urgentFlag,
this.gvMx1itemBarcode,
- this.gvMx1workNo,
this.gvMx1cItemCode,
this.gvMx1itemSname,
this.gvMx1itemNo,
this.gvMx1quantity,
this.gvMx1unit,
- this.gvMx1rbillNo,
this.gvMx1depotSectionCode,
this.gvMx1depotCode,
- this.gvMx1ebelnK3id,
- this.gvMx1lineK3id});
+ this.gridColumn3,
+ this.gridColumn4});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
this.gvMx2.OptionsView.ShowGroupPanel = false;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
- //
- // gvMx1urgentFlag
- //
- this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪";
- this.gvMx1urgentFlag.FieldName = "urgentFlag";
- this.gvMx1urgentFlag.MinWidth = 50;
- this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
- this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
- this.gvMx1urgentFlag.Visible = true;
- this.gvMx1urgentFlag.VisibleIndex = 0;
- this.gvMx1urgentFlag.Width = 94;
//
// gvMx1itemBarcode
//
@@ -1217,20 +1213,8 @@
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
- this.gvMx1itemBarcode.VisibleIndex = 1;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
this.gvMx1itemBarcode.Width = 250;
- //
- // gvMx1workNo
- //
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
- this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.Name = "gvMx1workNo";
- this.gvMx1workNo.Tag = "query_a.WORK_NO";
- this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 2;
- this.gvMx1workNo.Width = 100;
//
// gvMx1cItemCode
//
@@ -1241,7 +1225,7 @@
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
- this.gvMx1cItemCode.VisibleIndex = 3;
+ this.gvMx1cItemCode.VisibleIndex = 1;
this.gvMx1cItemCode.Width = 100;
//
// gvMx1itemSname
@@ -1253,7 +1237,7 @@
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
- this.gvMx1itemSname.VisibleIndex = 4;
+ this.gvMx1itemSname.VisibleIndex = 2;
this.gvMx1itemSname.Width = 250;
//
// gvMx1itemNo
@@ -1265,7 +1249,7 @@
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 5;
+ this.gvMx1itemNo.VisibleIndex = 3;
this.gvMx1itemNo.Width = 250;
//
// gvMx1quantity
@@ -1277,7 +1261,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 6;
+ this.gvMx1quantity.VisibleIndex = 4;
this.gvMx1quantity.Width = 94;
//
// gvMx1unit
@@ -1289,20 +1273,8 @@
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
- this.gvMx1unit.VisibleIndex = 7;
+ this.gvMx1unit.VisibleIndex = 5;
this.gvMx1unit.Width = 94;
- //
- // gvMx1rbillNo
- //
- this.gvMx1rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1rbillNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1rbillNo.Caption = "鍒拌揣鍗曞彿";
- this.gvMx1rbillNo.FieldName = "cbillNo";
- this.gvMx1rbillNo.Name = "gvMx1rbillNo";
- this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
- this.gvMx1rbillNo.Visible = true;
- this.gvMx1rbillNo.VisibleIndex = 8;
- this.gvMx1rbillNo.Width = 94;
//
// gvMx1depotSectionCode
//
@@ -1313,7 +1285,7 @@
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
- this.gvMx1depotSectionCode.VisibleIndex = 9;
+ this.gvMx1depotSectionCode.VisibleIndex = 6;
this.gvMx1depotSectionCode.Width = 94;
//
// gvMx1depotCode
@@ -1325,40 +1297,46 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 10;
+ this.gvMx1depotCode.VisibleIndex = 7;
this.gvMx1depotCode.Width = 94;
//
- // gvMx1ebelnK3id
+ // gridColumn3
//
- this.gvMx1ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
- this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
- this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx1ebelnK3id.Visible = true;
- this.gvMx1ebelnK3id.VisibleIndex = 11;
- this.gvMx1ebelnK3id.Width = 94;
+ this.gridColumn3.Caption = "寤虹珛鑰�";
+ this.gridColumn3.FieldName = "createBy";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 8;
+ this.gridColumn3.Width = 94;
//
- // gvMx1lineK3id
+ // gridColumn4
//
- this.gvMx1lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
- this.gvMx1lineK3id.FieldName = "lineK3id";
- this.gvMx1lineK3id.Name = "gvMx1lineK3id";
- this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx1lineK3id.Visible = true;
- this.gvMx1lineK3id.VisibleIndex = 12;
- this.gvMx1lineK3id.Width = 94;
+ this.gridColumn4.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn4.FieldName = "createDate";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 94;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_dptName);
+ this.panel1.Controls.Add(this.labelControl7);
+ this.panel1.Controls.Add(this.txt_scOrg);
+ this.panel1.Controls.Add(this.labelControl6);
+ this.panel1.Controls.Add(this.txt_itemModel);
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.txt_itemName);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_itemNo);
+ this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_fcheckUser);
- this.panel1.Controls.Add(this.txt_dptName);
- this.panel1.Controls.Add(this.txt_suppName);
+ this.panel1.Controls.Add(this.txt_depotName);
+ this.panel1.Controls.Add(this.txt_rkOrg);
this.panel1.Controls.Add(this.txt_fstatus);
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.labelControl1);
@@ -1367,7 +1345,7 @@
this.panel1.Controls.Add(this.lb_cbillNo);
this.panel1.Controls.Add(this.txt_cbillNo);
this.panel1.Controls.Add(this.lb_paperBillNo);
- this.panel1.Controls.Add(this.txt_paperBillNo);
+ this.panel1.Controls.Add(this.txt_workNo);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.lb_createDate);
@@ -1382,14 +1360,114 @@
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(1346, 127);
+ this.panel1.Size = new System.Drawing.Size(1346, 186);
this.panel1.TabIndex = 1;
+ //
+ // txt_dptName
+ //
+ this.txt_dptName.Location = new System.Drawing.Point(342, 84);
+ 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(244, 28);
+ this.txt_dptName.TabIndex = 605;
+ this.txt_dptName.Tag = "readonly";
+ //
+ // labelControl7
+ //
+ this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl7.Appearance.Options.UseFont = true;
+ this.labelControl7.Location = new System.Drawing.Point(268, 88);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(68, 21);
+ this.labelControl7.TabIndex = 604;
+ this.labelControl7.Text = "鐢熶骇杞﹂棿";
+ //
+ // txt_scOrg
+ //
+ this.txt_scOrg.Location = new System.Drawing.Point(342, 52);
+ this.txt_scOrg.Name = "txt_scOrg";
+ this.txt_scOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
+ this.txt_scOrg.Size = new System.Drawing.Size(244, 28);
+ this.txt_scOrg.TabIndex = 603;
+ this.txt_scOrg.Tag = "readonly";
+ //
+ // labelControl6
+ //
+ this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl6.Appearance.Options.UseFont = true;
+ this.labelControl6.Location = new System.Drawing.Point(268, 56);
+ this.labelControl6.Name = "labelControl6";
+ this.labelControl6.Size = new System.Drawing.Size(68, 21);
+ this.labelControl6.TabIndex = 602;
+ this.labelControl6.Text = "鐢熶骇缁勭粐";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(663, 116);
+ 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(228, 28);
+ this.txt_itemModel.TabIndex = 601;
+ this.txt_itemModel.Tag = "readonly";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(592, 120);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(68, 21);
+ this.labelControl5.TabIndex = 600;
+ this.labelControl5.Text = "瑙勬牸鍨嬪彿";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(99, 116);
+ 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(163, 28);
+ this.txt_itemName.TabIndex = 599;
+ this.txt_itemName.Tag = "readonly";
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(26, 120);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(68, 21);
+ this.labelControl4.TabIndex = 598;
+ this.labelControl4.Text = "浜у搧缂栫爜";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(342, 116);
+ 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(244, 28);
+ this.txt_itemNo.TabIndex = 597;
+ this.txt_itemNo.Tag = "readonly";
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(268, 120);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(68, 21);
+ this.labelControl3.TabIndex = 596;
+ this.labelControl3.Text = "浜у搧鍚嶇О";
//
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(831, 23);
+ this.labelControl2.Location = new System.Drawing.Point(842, 23);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(51, 21);
this.labelControl2.TabIndex = 594;
@@ -1397,36 +1475,36 @@
//
// txt_fcheckUser
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(891, 19);
+ this.txt_fcheckUser.Location = new System.Drawing.Point(902, 19);
this.txt_fcheckUser.Name = "txt_fcheckUser";
this.txt_fcheckUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckUser.Size = new System.Drawing.Size(174, 28);
this.txt_fcheckUser.TabIndex = 595;
//
- // txt_dptName
+ // txt_depotName
//
- this.txt_dptName.Location = new System.Drawing.Point(99, 87);
- 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(228, 28);
- this.txt_dptName.TabIndex = 593;
- this.txt_dptName.Tag = "readonly";
+ this.txt_depotName.Location = new System.Drawing.Point(663, 84);
+ this.txt_depotName.Name = "txt_depotName";
+ this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotName.Size = new System.Drawing.Size(156, 28);
+ this.txt_depotName.TabIndex = 593;
+ this.txt_depotName.Tag = "readonly";
//
- // txt_suppName
+ // txt_rkOrg
//
- this.txt_suppName.Location = new System.Drawing.Point(99, 53);
- this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_suppName.Properties.Appearance.Options.UseFont = true;
- this.txt_suppName.Size = new System.Drawing.Size(228, 28);
- this.txt_suppName.TabIndex = 592;
- this.txt_suppName.Tag = "readonly";
+ this.txt_rkOrg.Location = new System.Drawing.Point(342, 19);
+ this.txt_rkOrg.Name = "txt_rkOrg";
+ this.txt_rkOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
+ this.txt_rkOrg.Size = new System.Drawing.Size(244, 28);
+ this.txt_rkOrg.TabIndex = 592;
+ this.txt_rkOrg.Tag = "readonly";
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(891, 89);
+ this.txt_fstatus.Location = new System.Drawing.Point(902, 86);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "";
this.txt_fstatus.Size = new System.Drawing.Size(48, 24);
@@ -1434,7 +1512,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(891, 53);
+ this.txt_checkDate.Location = new System.Drawing.Point(902, 52);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -1445,7 +1523,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(814, 57);
+ this.labelControl1.Location = new System.Drawing.Point(825, 56);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 586;
@@ -1454,7 +1532,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(844, 63);
+ this.lbGuid.Location = new System.Drawing.Point(855, 56);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1471,187 +1549,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridBand1
- //
- this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand1.Caption = "瀹℃牳鏍囪瘑";
- this.gridBand1.Columns.Add(this.gv_fstatus);
- this.gridBand1.Columns.Add(this.gv_guid);
- this.gridBand1.Columns.Add(this.gv_reason);
- this.gridBand1.Columns.Add(this.gv_lastupdateBy);
- this.gridBand1.Columns.Add(this.gv_lastupdateDate);
- this.gridBand1.Columns.Add(this.gv_userNoBack);
- this.gridBand1.Columns.Add(this.gv_taskNo);
- this.gridBand1.Columns.Add(this.gv_checkRes);
- this.gridBand1.Columns.Add(this.gv_checkQty);
- this.gridBand1.Columns.Add(this.gv_mmlist);
- this.gridBand1.Columns.Add(this.gv_ebeln);
- this.gridBand1.Columns.Add(this.gv_transctionNo);
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.Columns.Add(this.gv_sapstatus);
- this.gridBand1.Columns.Add(this.gv_ischeck);
- this.gridBand1.Columns.Add(this.gv_insby);
- this.gridBand1.Columns.Add(this.gv_isVisual);
- this.gridBand1.Columns.Add(this.gv_urgentFlag);
- this.gridBand1.Columns.Add(this.gv_lineNo);
- this.gridBand1.Columns.Add(this.gv_taskLino);
- this.gridBand1.Columns.Add(this.gv_fbillno);
- this.gridBand1.Columns.Add(this.gv_fbillLino);
- this.gridBand1.Columns.Add(this.gv_custNo);
- this.gridBand1.Columns.Add(this.gv_custName);
- this.gridBand1.Columns.Add(this.gv_iqcReleaseNo);
- this.gridBand1.Columns.Add(this.gv_pickIns);
- this.gridBand1.Columns.Add(this.gv_fcheckUser);
- this.gridBand1.Columns.Add(this.gv_rbillNo);
- this.gridBand1.Columns.Add(this.gv_bgr);
- this.gridBand1.MinWidth = 50;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 50;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "鍏ュ簱缁勭粐";
- this.gridBand16.Columns.Add(this.bandedGridColumn2);
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 1;
- this.gridBand16.Width = 250;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "鍏ュ簱鍗曞彿";
- this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 20;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 2;
- this.gridBand2.Width = 180;
- //
- // gridBand3
- //
- this.gridBand3.Caption = "鍒拌揣鍗曞彿";
- this.gridBand3.Columns.Add(this.gv_cbillNo);
- this.gridBand3.MinWidth = 20;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 180;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "鍒涘缓浜�";
- this.gridBand5.Columns.Add(this.gv_createBy);
- this.gridBand5.MinWidth = 40;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 4;
- this.gridBand5.Width = 80;
- //
- // gridBand4
- //
- this.gridBand4.Caption = "鍒涘缓鏃堕棿";
- this.gridBand4.Columns.Add(this.gv_createDate);
- this.gridBand4.MinWidth = 20;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 5;
- this.gridBand4.Width = 180;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "瀹℃牳浜�";
- this.gridBand15.Columns.Add(this.gv_checkUser);
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 6;
- this.gridBand15.Width = 60;
- //
- // gridBand6
- //
- this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
- this.gridBand6.Columns.Add(this.gv_checkDate);
- this.gridBand6.Columns.Add(this.gv_insDate);
- this.gridBand6.Columns.Add(this.gv_fcheckDate);
- this.gridBand6.MinWidth = 20;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 7;
- this.gridBand6.Width = 180;
- //
- // gridBand7
- //
- this.gridBand7.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand7.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand7.Caption = "鏀惰揣浠�";
- this.gridBand7.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand10,
- this.gridBand9});
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 8;
- this.gridBand7.Width = 200;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "浠撳簱缂栧彿";
- this.gridBand10.Columns.Add(this.bandedGridColumn1);
- this.gridBand10.MinWidth = 20;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 100;
- //
- // gridBand9
- //
- this.gridBand9.Caption = "浠撳簱鍚嶇О";
- this.gridBand9.Columns.Add(this.gv_depotsId);
- this.gridBand9.Columns.Add(this.gv_depotsCode);
- this.gridBand9.MinWidth = 20;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 1;
- this.gridBand9.Width = 100;
- //
- // gridBand8
- //
- this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand8.Caption = "渚涘簲鍟�";
- this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand11,
- this.gridBand12});
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 9;
- this.gridBand8.Width = 250;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "渚涘簲鍟嗙紪鍙�";
- this.gridBand11.Columns.Add(this.gv_suppNo);
- this.gridBand11.MinWidth = 20;
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 100;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "渚涘簲鍟嗗悕绉�";
- this.gridBand12.Columns.Add(this.gv_suppId);
- this.gridBand12.MinWidth = 20;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 1;
- this.gridBand12.Width = 150;
- //
- // gridBand13
- //
- this.gridBand13.Caption = "閫佽揣鍗曞彿";
- this.gridBand13.Columns.Add(this.gv_paperBillNo);
- this.gridBand13.MinWidth = 50;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 10;
- this.gridBand13.Width = 120;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "澶囨敞淇℃伅";
- this.gridBand14.Columns.Add(this.gv_remark);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 11;
- this.gridBand14.Width = 120;
- //
// Frm_MesScrkDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1666,7 +1563,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -1684,9 +1581,14 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1703,15 +1605,9 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebeln;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
@@ -1721,7 +1617,7 @@
private DevExpress.XtraEditors.TextEdit txt_cbillNo;
private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
- private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1749,24 +1645,14 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_paperBillNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_userNoBack;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkUser;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_taskNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_insDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkRes;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkQty;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_mmlist;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ebeln;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsCode;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_transctionNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fstatus;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_factory;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_sapstatus;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ischeck;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_insby;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_isVisual;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_urgentFlag;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lineNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_taskLino;
@@ -1776,45 +1662,43 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_custName;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_iqcReleaseNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cbillNo;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_pickIns;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckUser;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckDate;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_rbillNo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_bgr;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppId;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
- private DevExpress.XtraEditors.TextEdit txt_suppName;
- private DevExpress.XtraEditors.TextEdit txt_dptName;
+ private DevExpress.XtraEditors.TextEdit txt_rkOrg;
+ private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1cItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemSname;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1rbillNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.TextEdit txt_fcheckUser;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn3;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn4;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn5;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn6;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn7;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
@@ -1827,5 +1711,19 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.TextEdit txt_scOrg;
+ private DevExpress.XtraEditors.LabelControl labelControl6;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
+ private DevExpress.XtraEditors.LabelControl labelControl7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index df980a6..8b8a961 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -110,7 +110,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- _toolCk(-1);
+ _toolCk(0);
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ecb884c..1e61b9f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -138,6 +138,7 @@
<Reference Include="System.Formats.Asn1, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
+ <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 4757468..fc262cf 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -38,7 +38,7 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new XtraForm1();
+ //Application.Run(new XtraForm1());
//return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
--
Gitblit v1.9.3