From a9ff79ecf6279fb863d7962643de54beaa4b5cc3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 08:07:29 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 14 --
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeShouJian.Designer.cs | 58 +++++++++
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 16 ++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 261 ++++++++++++++-----------------------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 9 +
5 files changed, 164 insertions(+), 194 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeShouJian.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeShouJian.Designer.cs
new file mode 100644
index 0000000..83d53e1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeShouJian.Designer.cs
@@ -0,0 +1,58 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class DefectCodeShouJian
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("棣栨璧勬枡");
+ this.SuspendLayout();
+ //
+ // defectCode1
+ //
+ this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.defectCode1.Location = new System.Drawing.Point(0, 0);
+ this.defectCode1.Name = "defectCode1";
+ this.defectCode1.Size = new System.Drawing.Size(1001, 568);
+ this.defectCode1.TabIndex = 0;
+ //
+ // DefectCodeDic
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1001, 568);
+ this.Controls.Add(this.defectCode1);
+ this.Name = "DefectCodeDic";
+ this.Text = "瀛楀吀-棣栨璧勬枡";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DefectCode defectCode1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index cb731d4..0e810ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -21,6 +21,10 @@
private readonly string _webServiceName = "MesQmCheckitemManager/";
public string strType = "";//iqc type
public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
+ private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftFcheckLevel = "2.涓�鑸楠屾按骞�(II)";//榛樿妫�楠屾按骞�
+ private string dftFacLevel = "0.015---(AQL_0_0015)";//榛樿鎺ユ敹姘村钩
public Jyxm(string _strType)
{
InitializeComponent();
@@ -42,24 +46,28 @@
toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
//绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
- if (strType == "iqc")
+ if (strType == QcSeason.iqc.ToString())
dfValue = 5;
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
- if (strType != "ipqc宸℃")
+ if (strType != QcSeason.ipqc宸℃.ToString())
{
gvMx1.Columns["stationName"].Visible = false;
}
//濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
- if (strType != "ipqc棣栨")
+ if (strType != QcSeason.ipqc棣栨.ToString())
{
gvMx1.Columns["isRzxx"].Visible = false;
}
//鏂拌鍒濆鍊�
this.gvMx1.InitNewRow += (s, e) =>
{
- this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
int newIndex = gvMx1.DataRowCount + 1;
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeName", dftSsampleSizeName);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeNo", dftSsampleSizeNo);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "facLevel", dftFacLevel);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "fcheckLevel", dftFcheckLevel);
};
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 60d7f61..ffc5015 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -38,7 +38,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -69,8 +68,6 @@
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -81,12 +78,10 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
- this.txtDepotsCode = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_receiveOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.txtSupplierCode = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
@@ -102,8 +97,6 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -111,9 +104,6 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -156,6 +146,9 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -175,7 +168,6 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -193,8 +185,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -202,9 +192,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -214,6 +201,9 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -300,8 +290,6 @@
this.gv_createDate,
this.gv_checkUser,
this.gv_checkDate,
- this.gv_depotsCode,
- this.gridColumn4,
this.gv_suppNo,
this.gridColumn5,
this.gv_remark,
@@ -428,28 +416,6 @@
this.gv_checkDate.VisibleIndex = 8;
this.gv_checkDate.Width = 64;
//
- // gv_depotsCode
- //
- this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
- this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栧彿";
- this.gv_depotsCode.FieldName = "depotsCode";
- this.gv_depotsCode.Name = "gv_depotsCode";
- this.gv_depotsCode.OptionsColumn.AllowEdit = false;
- this.gv_depotsCode.Tag = "query_a.depots_code";
- this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 9;
- this.gv_depotsCode.Width = 87;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鏀惰揣浠撳簱鍚嶇О";
- this.gridColumn4.FieldName = "depotName";
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 10;
- this.gridColumn4.Width = 128;
- //
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
@@ -459,7 +425,7 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 11;
+ this.gv_suppNo.VisibleIndex = 9;
this.gv_suppNo.Width = 69;
//
// gridColumn5
@@ -469,7 +435,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.VisibleIndex = 10;
this.gridColumn5.Width = 70;
//
// gv_remark
@@ -481,7 +447,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 13;
+ this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 90;
//
// gridColumn11
@@ -529,19 +495,17 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1231, 570);
- this.splitMx1.SplitterPosition = 175;
+ this.splitMx1.SplitterPosition = 149;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.btnSelect);
- this.layoutMx1.Controls.Add(this.txtDepotsCode);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_receiveOrgId);
this.layoutMx1.Controls.Add(this.txtSupplierCode);
this.layoutMx1.Controls.Add(this.txt_billNo);
- this.layoutMx1.Controls.Add(this.txt_depotsId);
this.layoutMx1.Controls.Add(this.txt_suppId);
this.layoutMx1.Controls.Add(this.txt_fstatus);
this.layoutMx1.Controls.Add(this.txt_fType);
@@ -559,7 +523,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1007, 106, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1231, 175);
+ this.layoutMx1.Size = new System.Drawing.Size(1231, 149);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -575,27 +539,16 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(12, 108);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 443;
this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
- // txtDepotsCode
- //
- this.txtDepotsCode.Location = new System.Drawing.Point(401, 74);
- this.txtDepotsCode.Name = "txtDepotsCode";
- this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
- this.txtDepotsCode.Properties.Tag = "";
- this.txtDepotsCode.Size = new System.Drawing.Size(212, 24);
- this.txtDepotsCode.StyleController = this.layoutMx1;
- this.txtDepotsCode.TabIndex = 454;
- this.txtDepotsCode.Tag = "readOnly";
- //
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(401, 105);
+ this.txt_remark.Location = new System.Drawing.Point(401, 76);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(515, 24);
@@ -605,14 +558,14 @@
// txt_receiveOrgId
//
this.txt_receiveOrgId.IsReadly = false;
- this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 43);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(401, 43);
+ this.txtSupplierCode.Location = new System.Drawing.Point(401, 44);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
@@ -632,19 +585,10 @@
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
//
- // txt_depotsId
- //
- this.txt_depotsId.IsReadly = false;
- this.txt_depotsId.Location = new System.Drawing.Point(99, 105);
- this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_depotsId.Name = "txt_depotsId";
- this.txt_depotsId.Size = new System.Drawing.Size(211, 24);
- this.txt_depotsId.TabIndex = 445;
- //
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(99, 74);
+ this.txt_suppId.Location = new System.Drawing.Point(99, 76);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(211, 24);
@@ -652,7 +596,7 @@
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(920, 74);
+ this.txt_fstatus.Location = new System.Drawing.Point(920, 76);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fstatus.Size = new System.Drawing.Size(299, 24);
@@ -682,7 +626,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(704, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(704, 44);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(212, 24);
@@ -702,7 +646,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1007, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(1007, 44);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
this.txt_checkDate.Size = new System.Drawing.Size(212, 24);
@@ -712,7 +656,7 @@
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(704, 74);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(401, 108);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
@@ -759,8 +703,6 @@
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
- this.layoutControlItem16,
this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem13,
@@ -768,8 +710,8 @@
this.layoutControlItem7,
this.layoutControlItem8,
this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem17,
+ this.layoutControlItem16,
this.lab_paperBillNo});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -794,24 +736,21 @@
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1231, 175);
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1231, 149);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_receiveOrgId;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
@@ -820,43 +759,19 @@
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_suppId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_depotsId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 93);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
- this.layoutControlItem4.Text = "閫夋嫨浠撳簱";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(302, 31);
- this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
//
// layoutControlItem11
//
@@ -864,18 +779,18 @@
this.layoutControlItem11.Location = new System.Drawing.Point(605, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem11.Text = "寤虹珛浜哄憳";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(605, 31);
+ this.layoutControlItem12.Location = new System.Drawing.Point(605, 32);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
@@ -885,29 +800,29 @@
this.layoutControlItem13.Location = new System.Drawing.Point(908, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(908, 31);
+ this.layoutControlItem14.Location = new System.Drawing.Point(908, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(908, 62);
+ this.layoutControlItem7.Location = new System.Drawing.Point(908, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -918,7 +833,7 @@
this.layoutControlItem8.Location = new System.Drawing.Point(302, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -926,47 +841,13 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(302, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(302, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(303, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txtDepotsCode;
- this.layoutControlItem6.Location = new System.Drawing.Point(302, 62);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(303, 31);
- this.layoutControlItem6.Text = "浠撳簱缂栫爜";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(302, 93);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(606, 31);
- this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
- //
- // lab_paperBillNo
- //
- this.lab_paperBillNo.Control = this.txt_paperBillNo;
- this.lab_paperBillNo.Location = new System.Drawing.Point(605, 62);
- this.lab_paperBillNo.Name = "lab_paperBillNo";
- this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_paperBillNo.Size = new System.Drawing.Size(303, 31);
- this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
- this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -974,7 +855,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1231, 383);
+ this.tabMx.Size = new System.Drawing.Size(1231, 409);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -983,7 +864,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1229, 351);
+ this.tabMxPage1.Size = new System.Drawing.Size(1229, 377);
this.tabMxPage1.Text = "鏀舵枡鏄庣粏";
//
// gcMx1
@@ -996,7 +877,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.rptHistory});
- this.gcMx1.Size = new System.Drawing.Size(1229, 351);
+ this.gcMx1.Size = new System.Drawing.Size(1229, 377);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1464,6 +1345,43 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_remark;
+ this.layoutControlItem17.Location = new System.Drawing.Point(302, 64);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(606, 32);
+ this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.btnSelect;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(302, 33);
+ this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // lab_paperBillNo
+ //
+ this.lab_paperBillNo.Control = this.txt_paperBillNo;
+ this.lab_paperBillNo.Location = new System.Drawing.Point(302, 96);
+ this.lab_paperBillNo.Name = "lab_paperBillNo";
+ this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_paperBillNo.Size = new System.Drawing.Size(303, 33);
+ this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
+ this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
+ //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1493,7 +1411,6 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -1511,8 +1428,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1520,9 +1435,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1532,6 +1444,9 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
this.ResumeLayout(false);
}
@@ -1552,8 +1467,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
@@ -1563,9 +1476,7 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private UserControl.UcLookOrg txt_receiveOrgId;
- private DevExpress.XtraEditors.TextEdit txtDepotsCode;
private DevExpress.XtraEditors.TextEdit txtSupplierCode;
- private UserControl.UcLookCk txt_depotsId;
private DevExpress.XtraEditors.SimpleButton btnSelect;
private UserControl.UcLookSupplier txt_suppId;
private System.Windows.Forms.Label lbGuid;
@@ -1574,14 +1485,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraEditors.CheckEdit txt_fType;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1620,10 +1529,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
- private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -1638,5 +1544,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 42a5d19..b81bd11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -56,12 +56,6 @@
if (string.IsNullOrEmpty(_orgId))
return;
txt_suppId.getSuppler(_orgId, _ucGys);
- txt_depotsId.getSuppler(_orgId, _ucCk);
- };
- //璁剧疆浠撳簱閫夋嫨
- this.txt_depotsId.EditChanged += (s, e) =>
- {
- txtDepotsCode.Text = this.txt_depotsId.GetCode();
};
//璁剧疆渚涘簲鍟嗛�夋嫨
this.txt_suppId.EditChanged += (s, e) =>
@@ -309,7 +303,6 @@
{
toolBarMenu1.isSetBtn = false;
string _orgId = txt_receiveOrgId.GetId();
- string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
if (string.IsNullOrEmpty(_orgId))
{
@@ -323,19 +316,12 @@
txt_suppId.Focus();
return;
}
- if (string.IsNullOrEmpty(_ckId))
- {
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotsId.Focus();
- return;
- }
var _obj = new
{
Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
Remark = txt_remark.Text.Trim(), //澶囨敞
SuppId = _gysId, //渚涘簲鍟�
- DepotsId = _ckId,//浠撳簱
OrgId = _orgId,
list = new List<dynamic>(),
};
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0d5a642..8413ea2 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2401,4 +2401,13 @@
public string fileType { get; set; }
}
+
+
+ public enum QcSeason
+ {
+ iqc,
+ ipqc宸℃,
+ ipqc棣栨,
+ fqc
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3