From d8737264b137b8f37fc3c902031b17eb2a3acc19 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 25 六月 2025 16:04:54 +0800
Subject: [PATCH] 超期复检
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs | 11
DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs | 5
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | 280 ++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs | 182 ++++--------------
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs | 10
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs | 58 +++--
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs | 24 +-
9 files changed, 231 insertions(+), 345 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3d80851..f77fd81 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
index 36b0a2c..090607f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -31,13 +31,12 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,32 +68,30 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_famc = new DevExpress.XtraEditors.TextEdit();
this.txt_bzqx = new DevExpress.XtraEditors.TextEdit();
- this.txt_fjxz = new DevExpress.XtraEditors.TextEdit();
this.txt_yjrq = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.frm_CqfaItems1 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
this.splitContainerControl2 = new DevExpress.XtraEditors.SplitContainerControl();
this.btnOut = new DevExpress.XtraEditors.SimpleButton();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.frm_CqfaItems2 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.frm_CqfaItems1 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
- this.frm_CqfaItems2 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -122,20 +119,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -274,8 +269,6 @@
this.gridColumn10.FieldName = "fjxz";
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 6;
this.gridColumn10.Width = 115;
//
// gridColumn1
@@ -333,7 +326,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 7;
+ this.gv_checkUser.VisibleIndex = 6;
this.gv_checkUser.Width = 115;
//
// gv_checkDate
@@ -345,7 +338,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 8;
+ this.gv_checkDate.VisibleIndex = 7;
this.gv_checkDate.Width = 115;
//
// gv_remark
@@ -357,7 +350,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 137;
//
// gridColumn7
@@ -405,7 +398,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1201, 570);
- this.splitMx1.SplitterPosition = 111;
+ this.splitMx1.SplitterPosition = 88;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -420,17 +413,17 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_famc);
this.layoutMx1.Controls.Add(this.txt_bzqx);
- this.layoutMx1.Controls.Add(this.txt_fjxz);
this.layoutMx1.Controls.Add(this.txt_yjrq);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
- this.layoutControlItem13});
+ this.layoutControlItem13,
+ this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(535, 431, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1201, 111);
+ this.layoutMx1.Size = new System.Drawing.Size(1201, 88);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -469,11 +462,11 @@
this.txt_fabm.Size = new System.Drawing.Size(192, 24);
this.txt_fabm.StyleController = this.layoutMx1;
this.txt_fabm.TabIndex = 211;
- this.txt_fabm.Tag = "";
+ this.txt_fabm.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(996, 42);
+ this.txt_checkDate.Location = new System.Drawing.Point(996, 46);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
@@ -483,10 +476,10 @@
//
// txt_bz
//
- this.txt_bz.Location = new System.Drawing.Point(111, 72);
+ this.txt_bz.Location = new System.Drawing.Point(701, 46);
this.txt_bz.Name = "txt_bz";
this.txt_bz.Properties.Appearance.Options.UseFont = true;
- this.txt_bz.Size = new System.Drawing.Size(487, 24);
+ this.txt_bz.Size = new System.Drawing.Size(192, 24);
this.txt_bz.StyleController = this.layoutMx1;
this.txt_bz.TabIndex = 252;
//
@@ -510,7 +503,7 @@
//
// txt_famc
//
- this.txt_famc.Location = new System.Drawing.Point(406, 12);
+ this.txt_famc.Location = new System.Drawing.Point(111, 46);
this.txt_famc.Name = "txt_famc";
this.txt_famc.Size = new System.Drawing.Size(192, 24);
this.txt_famc.StyleController = this.layoutMx1;
@@ -518,23 +511,15 @@
//
// txt_bzqx
//
- this.txt_bzqx.Location = new System.Drawing.Point(406, 42);
+ this.txt_bzqx.Location = new System.Drawing.Point(406, 12);
this.txt_bzqx.Name = "txt_bzqx";
this.txt_bzqx.Size = new System.Drawing.Size(192, 24);
this.txt_bzqx.StyleController = this.layoutMx1;
this.txt_bzqx.TabIndex = 534;
//
- // txt_fjxz
- //
- this.txt_fjxz.Location = new System.Drawing.Point(701, 42);
- this.txt_fjxz.Name = "txt_fjxz";
- this.txt_fjxz.Size = new System.Drawing.Size(192, 24);
- this.txt_fjxz.StyleController = this.layoutMx1;
- this.txt_fjxz.TabIndex = 535;
- //
// txt_yjrq
//
- this.txt_yjrq.Location = new System.Drawing.Point(111, 42);
+ this.txt_yjrq.Location = new System.Drawing.Point(406, 46);
this.txt_yjrq.Name = "txt_yjrq";
this.txt_yjrq.Size = new System.Drawing.Size(192, 24);
this.txt_yjrq.StyleController = this.layoutMx1;
@@ -563,6 +548,18 @@
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
//
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_checkStatus;
+ this.layoutControlItem6.Location = new System.Drawing.Point(885, 60);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(296, 31);
+ this.layoutControlItem6.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -570,40 +567,35 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem6,
this.layoutControlItem1,
this.layoutControlItem3,
- this.layoutControlItem5,
- this.layoutControlItem2,
- this.layoutControlItem4,
this.layoutControlItem8,
+ this.layoutControlItem2,
+ this.layoutControlItem5,
this.layoutControlItem7});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1201, 111);
+ rowDefinition1,
+ rowDefinition2});
+ this.Root.Size = new System.Drawing.Size(1201, 88);
this.Root.TextVisible = false;
//
// layoutControlItem9
@@ -613,82 +605,39 @@
this.layoutControlItem9.Location = new System.Drawing.Point(885, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(296, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(296, 34);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(885, 30);
+ this.layoutControlItem10.Location = new System.Drawing.Point(885, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(296, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(296, 34);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_checkStatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(885, 60);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(296, 31);
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fabm;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(295, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem1.Text = "鏂规缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_famc;
- this.layoutControlItem3.Location = new System.Drawing.Point(295, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(295, 30);
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem3.Text = "鏂规鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_yjrq;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(295, 30);
- this.layoutControlItem5.Text = "棰勮鏃ユ湡(澶�)";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_bzqx;
- this.layoutControlItem2.Location = new System.Drawing.Point(295, 30);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(295, 30);
- this.layoutControlItem2.Text = "璐ㄤ繚鏈熼檺(澶�)";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fjxz;
- this.layoutControlItem4.Location = new System.Drawing.Point(590, 30);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(295, 30);
- this.layoutControlItem4.Text = "澶嶆闄愬��(娆�)";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
@@ -696,18 +645,39 @@
this.layoutControlItem8.Location = new System.Drawing.Point(590, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(295, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem8.Text = "浣跨敤缁勭粐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_bzqx;
+ this.layoutControlItem2.Location = new System.Drawing.Point(295, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(295, 34);
+ this.layoutControlItem2.Text = "璐ㄤ繚鏈熼檺(澶�)";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_yjrq;
+ this.layoutControlItem5.Location = new System.Drawing.Point(295, 34);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(295, 34);
+ this.layoutControlItem5.Text = "棰勮鏃ユ湡(澶�)";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_bz;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem7.Location = new System.Drawing.Point(590, 34);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(590, 31);
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem7.Text = "鏂规澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
@@ -717,7 +687,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(1201, 447);
+ this.tabMx.Size = new System.Drawing.Size(1201, 470);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -726,7 +696,7 @@
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1199, 415);
+ this.tabMxPage1.Size = new System.Drawing.Size(1199, 438);
this.tabMxPage1.Text = "鏂规鏄庣粏";
//
// splitContainerControl1
@@ -745,9 +715,17 @@
this.splitContainerControl1.Panel2.Controls.Add(this.splitContainerControl2);
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitContainerControl1.Size = new System.Drawing.Size(1199, 415);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1199, 438);
this.splitContainerControl1.SplitterPosition = 628;
this.splitContainerControl1.TabIndex = 0;
+ //
+ // frm_CqfaItems1
+ //
+ this.frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.frm_CqfaItems1.Location = new System.Drawing.Point(0, 0);
+ this.frm_CqfaItems1.Name = "frm_CqfaItems1";
+ this.frm_CqfaItems1.Size = new System.Drawing.Size(628, 438);
+ this.frm_CqfaItems1.TabIndex = 0;
//
// splitContainerControl2
//
@@ -766,7 +744,7 @@
this.splitContainerControl2.Panel2.Controls.Add(this.frm_CqfaItems2);
this.splitContainerControl2.Panel2.Text = "Panel2";
this.splitContainerControl2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False;
- this.splitContainerControl2.Size = new System.Drawing.Size(559, 415);
+ this.splitContainerControl2.Size = new System.Drawing.Size(559, 438);
this.splitContainerControl2.SplitterPosition = 71;
this.splitContainerControl2.TabIndex = 0;
//
@@ -790,6 +768,14 @@
this.btnIn.TabIndex = 1;
this.btnIn.Text = "<<";
//
+ // frm_CqfaItems2
+ //
+ this.frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.frm_CqfaItems2.Location = new System.Drawing.Point(0, 0);
+ this.frm_CqfaItems2.Name = "frm_CqfaItems2";
+ this.frm_CqfaItems2.Size = new System.Drawing.Size(476, 438);
+ this.frm_CqfaItems2.TabIndex = 0;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -808,22 +794,6 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
- //
- // frm_CqfaItems1
- //
- this.frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.frm_CqfaItems1.Location = new System.Drawing.Point(0, 0);
- this.frm_CqfaItems1.Name = "frm_CqfaItems1";
- this.frm_CqfaItems1.Size = new System.Drawing.Size(628, 415);
- this.frm_CqfaItems1.TabIndex = 0;
- //
- // frm_CqfaItems2
- //
- this.frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.frm_CqfaItems2.Location = new System.Drawing.Point(0, 0);
- this.frm_CqfaItems2.Name = "frm_CqfaItems2";
- this.frm_CqfaItems2.Size = new System.Drawing.Size(476, 415);
- this.frm_CqfaItems2.TabIndex = 0;
//
// Frm_Cqfa
//
@@ -862,20 +832,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -931,18 +899,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraEditors.TextEdit txt_famc;
private DevExpress.XtraEditors.TextEdit txt_bzqx;
- private DevExpress.XtraEditors.TextEdit txt_fjxz;
private DevExpress.XtraEditors.TextEdit txt_yjrq;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private UserControl.UcLookOrg txt_fSubsidiary;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
@@ -951,8 +913,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitContainerControl2;
private DevExpress.XtraEditors.SimpleButton btnIn;
private DevExpress.XtraEditors.SimpleButton btnOut;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private Frm_CqfaItems frm_CqfaItems1;
private Frm_CqfaItems frm_CqfaItems2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
index 1f2f5c5..63142db 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraPivotGrid.Data;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -44,13 +43,33 @@
//绉诲叆
btnIn.Click += (s, e) =>
{
+ if (lbGuid.Text.Length <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堜繚瀛樻柟妗堬紒");
+ return;
+ }
string strItemsGuids = frm_CqfaItems2.GetSelect();
+ if (string.IsNullOrEmpty(strItemsGuids))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堝嬀閫夐渶瑕佺Щ鍏ョ殑鐗╂枡锛�");
+ return;
+ }
_toolOutIn(1, strItemsGuids);
};
//绉诲嚭
btnOut.Click += (s, e) =>
{
+ if (lbGuid.Text.Length <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堜繚瀛樻柟妗堬紒");
+ return;
+ }
string strItemsGuids = frm_CqfaItems1.GetSelect();
+ if (string.IsNullOrEmpty(strItemsGuids))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堝嬀閫夐渶瑕佺Щ鍑虹殑鐗╂枡锛�");
+ return;
+ }
_toolOutIn(0, strItemsGuids);
};
}
@@ -148,23 +167,24 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelOrMx",
+ _webServiceName + "DeleteModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -213,7 +233,6 @@
txt_fabm.ReadOnly = true;
txt_fSubsidiary.Enabled = false;
}
-
}
/// <summary>
/// 鏂板浜嬩欢
@@ -238,23 +257,15 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _fabm = txt_fabm.Text.Trim();
string _famc = txt_famc.Text.Trim();
string _yjrq = txt_yjrq.Text.Trim();
string _bzqx = txt_bzqx.Text.Trim();
- string _fjxz = txt_fjxz.Text.Trim();
string _bz = txt_bz.Text.Trim();
string _fSubsidiary = txt_fSubsidiary.GetId();
if (string.IsNullOrEmpty(_fSubsidiary))
{
MsgHelper.ShowError("缁勭粐涓嶈兘涓虹┖锛�");
txt_fSubsidiary.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_famc))
- {
- MsgHelper.ShowError("鏂规缂栫爜涓嶈兘涓虹┖锛�");
- txt_fabm.Focus();
return;
}
if (string.IsNullOrEmpty(_famc))
@@ -275,20 +286,13 @@
txt_bzqx.Focus();
return;
}
- if (string.IsNullOrEmpty(_fjxz))
- {
- MsgHelper.ShowError("澶嶆闄愬��(娆�)涓嶈兘涓虹┖锛�");
- txt_fjxz.Focus();
- return;
- }
var _obj = new
{
guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()),
yjrq = (_yjrq),
bzqx = (_bzqx),
- fjxz = (_fjxz),
+ fjxz = (0),
famc = _famc.Trim(),
- fabm = _fabm.Trim(),
bz = _bz.Trim(),
fSubsidiary = _fSubsidiary.Trim(),
};
@@ -298,7 +302,6 @@
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -308,6 +311,7 @@
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ getModel(lbGuid.Text);
}
else
MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -371,7 +375,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -387,7 +391,7 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
- frm_CqfaItems1.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
+ frm_CqfaItems1.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
frm_CqfaItems2.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId());
}
else
@@ -479,7 +483,7 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ if (!MsgHelper.AskQuestion("纭畾鎶婃墍閫夋嫨鐨勭墿鏂欍��"+ strMsg + "銆戞柟妗堛��" + rowName + "銆戝悧锛�"))
return;
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
index 899819a..f92475f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
@@ -38,8 +38,8 @@
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
this.SuspendLayout();
@@ -152,8 +152,6 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "a.guid";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 94;
//
// gv_itemId
@@ -166,6 +164,16 @@
this.gv_itemId.Tag = "a.item_model";
this.gv_itemId.Width = 50;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鏂规缂栫爜";
+ this.gridColumn3.FieldName = "fabm";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -177,16 +185,6 @@
this.pageBar1.Size = new System.Drawing.Size(877, 48);
this.pageBar1.TabIndex = 10;
this.pageBar1.TotalPages = 0;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鏂规缂栫爜";
- this.gridColumn3.FieldName = "fabm";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 94;
//
// Frm_CqfaItems
//
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
index af73aae..ef86d2a 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
@@ -1,6 +1,4 @@
-锘縰sing DevExpress.RichEdit.Export;
-using DevExpress.Utils.DirectXPaint;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -32,6 +30,13 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_pGuid"></param>
+ /// <param name="_strType"></param>
+ /// <param name="_orgId"></param>
public void Initialize(string _pGuid, string _strType, string _orgId)
{
strType = _strType;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index f48bf14..4003438 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -49,17 +49,12 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -106,12 +101,11 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -127,7 +121,6 @@
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -174,11 +167,11 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -258,17 +251,12 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gv_status,
- this.gv_isFinish,
- this.gv_isOut,
this.gv_billNo,
this.gv_lastUpdateUser,
this.gv_lastUpdateTime,
this.gv_checkUser,
this.gv_checkDate,
this.gv_returnMethod,
- this.gv_returnType,
- this.gv_depotId,
- this.gv_suppId,
this.gv_remark,
this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
@@ -280,53 +268,27 @@
//
// gridColumn1
//
- this.gridColumn1.Caption = "閫�璐х粍缁�";
- this.gridColumn1.FieldName = "receivingOrg";
+ this.gridColumn1.Caption = "鐢宠缁勭粐";
+ this.gridColumn1.FieldName = "kcOrg";
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 250;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鐘舵��";
- this.gv_status.FieldName = "status";
+ this.gv_status.FieldName = "checkStatus";
this.gv_status.MaxWidth = 50;
this.gv_status.MinWidth = 50;
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.VisibleIndex = 1;
+ this.gv_status.VisibleIndex = 0;
this.gv_status.Width = 50;
- //
- // gv_isFinish
- //
- this.gv_isFinish.AppearanceCell.Options.UseFont = true;
- this.gv_isFinish.Caption = "鏄惁瀹屾垚";
- this.gv_isFinish.FieldName = "isFinish";
- this.gv_isFinish.MaxWidth = 50;
- this.gv_isFinish.MinWidth = 50;
- this.gv_isFinish.Name = "gv_isFinish";
- this.gv_isFinish.OptionsColumn.AllowEdit = false;
- this.gv_isFinish.Tag = "query_a.IS_FINISH";
- this.gv_isFinish.Width = 50;
- //
- // gv_isOut
- //
- this.gv_isOut.AppearanceCell.Options.UseFont = true;
- this.gv_isOut.Caption = "濮斿鏍囪瘑";
- this.gv_isOut.FieldName = "isOut";
- this.gv_isOut.MaxWidth = 50;
- this.gv_isOut.MinWidth = 50;
- this.gv_isOut.Name = "gv_isOut";
- this.gv_isOut.OptionsColumn.AllowEdit = false;
- this.gv_isOut.Tag = "query_a.IS_OUT";
- this.gv_isOut.Visible = true;
- this.gv_isOut.VisibleIndex = 2;
- this.gv_isOut.Width = 50;
//
// gv_billNo
//
@@ -337,43 +299,43 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 3;
+ this.gv_billNo.VisibleIndex = 2;
this.gv_billNo.Width = 120;
//
// gv_lastUpdateUser
//
this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
- this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+ this.gv_lastUpdateUser.FieldName = "lastUpdateBy";
this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
this.gv_lastUpdateUser.Visible = true;
- this.gv_lastUpdateUser.VisibleIndex = 4;
+ this.gv_lastUpdateUser.VisibleIndex = 3;
this.gv_lastUpdateUser.Width = 94;
//
// gv_lastUpdateTime
//
this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
- this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+ this.gv_lastUpdateTime.FieldName = "lastUpdateDate";
this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
this.gv_lastUpdateTime.Visible = true;
- this.gv_lastUpdateTime.VisibleIndex = 5;
+ this.gv_lastUpdateTime.VisibleIndex = 4;
this.gv_lastUpdateTime.Width = 180;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "checkBy";
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.VisibleIndex = 6;
+ this.gv_checkUser.VisibleIndex = 5;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -385,56 +347,20 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 6;
this.gv_checkDate.Width = 94;
//
// gv_returnMethod
//
this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
- this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
- this.gv_returnMethod.FieldName = "returnMethod";
+ this.gv_returnMethod.Caption = "鐢宠绫诲瀷";
+ this.gv_returnMethod.FieldName = "billType";
this.gv_returnMethod.Name = "gv_returnMethod";
this.gv_returnMethod.OptionsColumn.AllowEdit = false;
this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
this.gv_returnMethod.Visible = true;
- this.gv_returnMethod.VisibleIndex = 8;
+ this.gv_returnMethod.VisibleIndex = 7;
this.gv_returnMethod.Width = 94;
- //
- // gv_returnType
- //
- this.gv_returnType.AppearanceCell.Options.UseFont = true;
- this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
- this.gv_returnType.FieldName = "returnType";
- this.gv_returnType.Name = "gv_returnType";
- this.gv_returnType.OptionsColumn.AllowEdit = false;
- this.gv_returnType.Tag = "query_a.RETURN_TYPE";
- this.gv_returnType.Visible = true;
- this.gv_returnType.VisibleIndex = 9;
- this.gv_returnType.Width = 94;
- //
- // gv_depotId
- //
- this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "浠撳簱";
- this.gv_depotId.FieldName = "dptName";
- this.gv_depotId.Name = "gv_depotId";
- this.gv_depotId.OptionsColumn.AllowEdit = false;
- this.gv_depotId.Tag = "query_a.DEPOT_ID";
- this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 10;
- this.gv_depotId.Width = 94;
- //
- // gv_suppId
- //
- 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.VisibleIndex = 11;
- this.gv_suppId.Width = 94;
//
// gv_remark
//
@@ -445,7 +371,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 94;
//
// gridColumn7
@@ -866,8 +792,6 @@
this.gridColumn15,
this.gridColumn16,
this.gridColumn17,
- this.gridColumn18,
- this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
this.gridColumn22,
@@ -940,7 +864,7 @@
//
this.gridColumn13.AppearanceCell.Options.UseFont = true;
this.gridColumn13.Caption = "鏁伴噺";
- this.gridColumn13.FieldName = "gqsl";
+ this.gridColumn13.FieldName = "quantity";
this.gridColumn13.MinWidth = 50;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "yz_quantity_0_edit";
@@ -952,7 +876,7 @@
//
this.gridColumn14.AppearanceCell.Options.UseFont = true;
this.gridColumn14.Caption = "鏈夋晥鏈熻嚦(澶嶆鍓�)";
- this.gridColumn14.FieldName = "sqsl";
+ this.gridColumn14.FieldName = "yxqDate";
this.gridColumn14.MinWidth = 50;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Tag = "yz_quantity_0_edit";
@@ -963,7 +887,7 @@
// gridColumn15
//
this.gridColumn15.Caption = "閲嶆娆℃暟";
- this.gridColumn15.FieldName = "wcsl";
+ this.gridColumn15.FieldName = "cjcs";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
@@ -974,7 +898,7 @@
//
this.gridColumn16.AppearanceCell.Options.UseFont = true;
this.gridColumn16.Caption = "鍓╀綑瓒呮湡澶╂暟";
- this.gridColumn16.FieldName = "remark";
+ this.gridColumn16.FieldName = "syts";
this.gridColumn16.MinWidth = 50;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Tag = "edit";
@@ -992,49 +916,34 @@
this.gridColumn17.VisibleIndex = 0;
this.gridColumn17.Width = 94;
//
- // gridColumn18
- //
- this.gridColumn18.Caption = "閫佹浜�";
- this.gridColumn18.MinWidth = 25;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 8;
- this.gridColumn18.Width = 94;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "閫佹鏃堕棿";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 94;
- //
// gridColumn20
//
this.gridColumn20.Caption = "鍙栧嚭搴撲綅";
+ this.gridColumn20.FieldName = "qckw";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 10;
+ this.gridColumn20.VisibleIndex = 8;
this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "澶嶆缁撴灉";
+ this.gridColumn21.FieldNameSortGroup = "fjjg";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 11;
+ this.gridColumn21.VisibleIndex = 9;
this.gridColumn21.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "鏈夋晥鏈熻嚦(澶嶆鍚�)";
+ this.gridColumn22.FieldName = "yxqDate2";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 12;
+ this.gridColumn22.VisibleIndex = 10;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -1044,8 +953,19 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 13;
+ this.gridColumn23.VisibleIndex = 11;
this.gridColumn23.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// tabMxPage2
//
@@ -1207,17 +1127,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
// Frm_Cqsq
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1274,11 +1183,11 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -1292,17 +1201,12 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
- private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1346,8 +1250,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
index 0a3d48b..091c7cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
@@ -59,7 +59,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨缁勭粐锛�");
return;
}
- var frm = new SelectCqsq(this.txt_kcOrgId.GetId());
+ var frm = new SelectCqsq(this.txt_kcOrgId.GetId());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -77,6 +77,12 @@
_row["itemNo"] = dym.itemNo;
_row["itemName"] = dym.itemName;
_row["itemModel"] = dym.itemModel;
+ _row["quantity"]= dym.quantity;
+ _row["yxqDate"] = dym.yxqDate;
+ _row["syts"] = dym.syts;
+ _row["cjcs"] = dym.cjcs;
+ _row["yxqDate2"] = dym.yxqDate2;
+ _row["qckw"] = dym.qckw;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -584,7 +590,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- getModel(lbGuid.Text);
+ getModel(lbGuid.Text);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
index 336bdbc..378d596 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
@@ -55,6 +55,11 @@
itemNo = dr["itemNo"].ToString(),
itemId = dr["itemId"].ToString(),
quantity = dr["quantity"].ToString(),
+ yxqDate = dr["鏈夋晥鏈熻嚦澶嶆鍓�"].ToString(),
+ syts = dr["鍓╀綑瓒呮湡澶╂暟"].ToString(),
+ cjcs = dr["閲嶆娆℃暟"].ToString(),
+ yxqDate2 = dr["鏈夋晥鏈熻嚦澶嶆鍚�"].ToString(),
+ qckw = dr["鍙栧嚭搴撲綅"].ToString(),
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 7a8d055..02ce5dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -47,7 +47,6 @@
txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
-
}
/// <summary>
@@ -412,6 +411,7 @@
dataTable.Rows.Add("ZSM(杩芥函鐮�)");
dataTable.Rows.Add("TB(鎵樻澘鐮�)");
dataTable.Rows.Add("JYSQ(妫�楠岀敵璇�)");
+ dataTable.Rows.Add("JYFA(妫�楠屾柟妗�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
--
Gitblit v1.9.3