From 475eadcff3012b2b54d22174e0970f9d24cfa6b4 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 17:30:30 +0800
Subject: [PATCH] 1111
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 12
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 7
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs | 8
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 479 ++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 336 ++--
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs | 11
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs | 2
DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs | 17
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 9
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 19
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs | 13
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 35
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 14
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 21
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 12
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Rpt/CkYtmx.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs | 12
DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintInfo.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 12
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 12
DevApp/Gs.DevApp/UserControl/Toast.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs | 14
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/UcPageBar.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 2
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs | 6
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 296 ---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 14
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 55
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 12
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | 12
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 12
DevApp/Gs.DevApp/Gs.DevApp.csproj | 17
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 14
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 15
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 17
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 12
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 43
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 14
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 14
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs | 15
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 51
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutCDetails.cs | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 113 +
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs | 244 ++-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 21
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 600 +++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 13
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs | 8
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 15
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 41
DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 9
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 42
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs | 2
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 12
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 12
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 16
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs | 12
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs | 3
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 14
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs | 2
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs | 12
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 7
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 13
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs | 2
DevApp/Gs.DevApp/UserControl/Toast.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs | 9
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 12
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx | 3
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 9
DevApp/Gs.DevApp/UserControl/SelectDaa.cs | 3
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs | 13
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 14
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 13
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | 12
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs | 12
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs | 10
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs | 30
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 14
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 12
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs | 2
DevApp/Gs.DevApp/UserControl/UcPageBar.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs | 9
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs | 9
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 7
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs | 10
DevApp/Gs.DevApp/UserControl/SelectOrg.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 12
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs | 51
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 7
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 7
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs | 9
DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs | 114
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 20
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 15
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 14
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 10
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs | 9
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 14
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs | 8
DevApp/Gs.DevApp/Properties/licenses.licx | 43
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 12
225 files changed, 1,958 insertions(+), 2,315 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d3ac20..febccc3 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,7 +37,7 @@
<appSettings>
<add key="webapiurl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.8.8:8081/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.0.51:8081/" />-->
<!--<add key="WebApiUrl" value="http://192.168.0.51:8181/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
@@ -49,7 +49,7 @@
<add key="AsyncSeconds" value="2" /><!--姘存瓒呮椂鏃堕棿-->
<add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�鍙婂伐浣嶇爜-->
<add key="IqcGetWeight" value="3000" /><!--iqc璇荤О閲嶆椂-->
- <add key="TimingMailInterval" value="10000" />
+ <add key="TimingMailInterval" value="10000" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index b9600ff..97f710f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -1,7 +1,5 @@
锘�
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Customer
{
@@ -59,7 +57,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -762,7 +760,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fseller;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
index bc79284..51d78d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Customer : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index b37220d..f614b16 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -1,7 +1,5 @@
锘�
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Department
{
@@ -59,7 +57,7 @@
this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -716,7 +714,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index fa581a1..95b7023 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Department : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 787f3ab..8da868d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesDepot
{
@@ -66,7 +63,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -941,7 +938,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 03979d6..3700bab 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,19 +1,19 @@
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.DevFrm.Warehouse.Models;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesDepot : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 2058bc5..724def6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemType
{
@@ -52,7 +49,7 @@
this.gv_description = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -558,7 +555,7 @@
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_tcode;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index e2a6748..8d615f5 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemType : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 6450244..7a6be1a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -1,7 +1,5 @@
锘�
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItems
{
@@ -74,7 +72,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1241,7 +1239,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_kfName;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 22ddfc9..fcfdf8d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -1,15 +1,16 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.BasicData;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItems : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 9cf7456..8745e79 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesUnit
{
@@ -61,7 +58,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -784,7 +781,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fdescription;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 78119fb..d706657 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesUnit : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 38cbbfa..9d61670 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesWorkshopLine
{
@@ -60,7 +57,7 @@
this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -721,7 +718,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookDepartment txt_dptId;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index b37a921..4e935ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -1,14 +1,14 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesWorkshopLine : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index bfe670f..9908d7b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -1,7 +1,5 @@
锘�
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Staff
{
@@ -60,7 +58,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -775,7 +773,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index f59d888..3852e31 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Staff : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 01863e6..728c000 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -1,7 +1,5 @@
锘�
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Supplier
{
@@ -63,7 +61,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -864,7 +862,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.MemoEdit txt_suppName;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index d8a0181..0d3468a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -1,15 +1,16 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.BasicData;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Supplier : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 4d33c13..c3d6eab 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesCgthSq
{
@@ -73,7 +70,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -146,10 +143,10 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1334,7 +1331,11 @@
//
// gridColumn8
//
- this.gridColumn8.Caption = "褰撳墠鎬诲簱瀛�";
+ this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn8.Caption = "Mes/Erp搴撳瓨";
this.gridColumn8.FieldName = "kcQty";
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
@@ -1374,17 +1375,6 @@
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(965, 64);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 8;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// gridColumn12
//
this.gridColumn12.Caption = "SRM鏍囪瘑";
@@ -1404,6 +1394,17 @@
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 8;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_MesCgthSq
//
@@ -1500,7 +1501,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 911f17c..30cce3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesCgthSq : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
index 85a201b..d7314bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesCgthSqDj
{
@@ -66,7 +63,7 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1445,7 +1442,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index 7aa3eb2..3d73f65 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesCgthSqDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 7f53e63..4c06af7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesInvItemOut_SCLL
{
@@ -66,7 +63,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1395,7 +1392,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index cdbe288..2df7f3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesInvItemOut_SCLL : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.Designer.cs
index 673127d..a43c2e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemBl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
index 9daf804..a904680 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemBl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.Designer.cs
index 275ef79..93c4694 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemBlDJ
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
index ae1cfe7..ed868fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemBlDJ : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.Designer.cs
index 94dacbc..23a1ca3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemCl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
index aa56a56..66a6e6a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemCl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.Designer.cs
index 940f66a..f752fb8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemClDj
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
index c4531b2..cb1aff7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemClDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index c7d3701..3a9be81 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemQt
{
@@ -78,7 +75,7 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1729,7 +1726,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_qt002;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookHuoZhu ucLookHuoZhu1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index e691741..41a19c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemQt : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index 1aee7c6..ed5b909 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class Frm_MesItemQtDj
{
@@ -70,7 +68,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1468,7 +1466,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
index 691a06b..07a9b14 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesSctkSq
{
@@ -61,7 +58,7 @@
this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1079,7 +1076,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index 3accc55..ca64647 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesSctkSq : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
index cfc0d80..df84d7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class Frm_MesSctkSqDj
{
@@ -57,7 +55,7 @@
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1189,7 +1187,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
index 0c5272d..57d79c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class Frm_MesYanTui
{
@@ -58,7 +56,7 @@
this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1183,7 +1181,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
index 615ebf4..e1154a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm
{
partial class SelectSctk
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
index eddf9b1..628e646 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Ck
+namespace Gs.DevApp.DevFrm
{
public partial class SelectSctk : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 005aa7c..431d1df 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class UcBlcl
{
@@ -72,7 +70,7 @@
this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1475,7 +1473,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_wcUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_wcTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookOrg txt_orgId;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index 5c419e5..e62b46f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Ck
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class UcBlclDj
{
@@ -64,7 +62,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1396,7 +1394,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
index 6c68477..3ece8fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
partial class Frm_FQCItem
{
@@ -83,7 +81,7 @@
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2027,7 +2025,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 675be08..f57891a 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
partial class Frm_FqcDetect01
{
@@ -84,7 +82,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2591,7 +2589,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
index aa06d41..ebc4cf8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
partial class MesFqcExceptional
{
@@ -72,7 +70,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTopMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -1788,7 +1786,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index 76ca626..13b9160 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.IPQC
+锘縩amespace Gs.DevApp.DevFrm.IPQC
{
partial class Frm_ShouJianDetect01
{
@@ -85,7 +83,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptButtonUrl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2102,7 +2100,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
index 71be4e7..9d1ce60 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
@@ -16,7 +16,7 @@
public partial class Frm_ShouJianDetect01H5 : DevExpress.XtraEditors.XtraForm
{
private string guid = "";
- private string WebApiUrl = "http://192.168.0.51:8186/AutoUpdater/h5/shoujian.html";
+ private string WebApiUrl = "http://192.168.1.145:86/AutoUpdater/h5/shoujian.html";
private ChromiumWebBrowser chromeBrowser;
public Frm_ShouJianDetect01H5(string _guid)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
index 4489e9e..18de00d 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.IPQC
+锘縩amespace Gs.DevApp.DevFrm.IPQC
{
partial class Frm_XunJianDetect01
{
@@ -78,7 +76,7 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2074,7 +2072,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs
index 89891c5..31cf9b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.IPQC
+锘縩amespace Gs.DevApp.DevFrm
{
partial class Frm_XunJianDetect01Show
{
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs
index bf37945..8be3774 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs
@@ -1,7 +1,16 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.IPQC
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_XunJianDetect01Show : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index b7b660e..61917b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
{
partial class Frm_MESJJERRORJS
{
@@ -62,7 +60,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1254,7 +1252,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
index 80de1ab..125ad2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
{
partial class Frm_MesDeToLine
{
@@ -53,7 +51,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -805,7 +803,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
index 727d9d3..4145570 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
{
partial class Frm_MesJJSalary
{
@@ -57,7 +55,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1024,7 +1022,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
index f5f98bc..5fa2d9a 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
{
partial class Frm_MesJSSalary
{
@@ -54,7 +52,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -867,7 +865,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
index e77683d..5936633 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
{
partial class Frm_MesJjgzSchedule
{
@@ -59,7 +57,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1028,7 +1026,7 @@
private DevExpress.XtraEditors.DateEdit txt_BeginTime;
private DevExpress.XtraEditors.DateEdit txt_EndTime;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
index 3ebb8fa..1dfc3b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.Rpt
{
partial class KQCX
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
index f103c7c..0b25fdf 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
@@ -1,12 +1,19 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.JJGZ
+namespace Gs.DevApp.DevFrm.Rpt
{
public partial class KQCX : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
index 1cab96f..9355c17 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectSTAFF
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
index b028b0e..2d2e79e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
@@ -1,11 +1,12 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.JJGZ
+namespace Gs.DevApp.UserControl
{
public partial class SelectSTAFF : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
index 85e5695..13d4849 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.JJGZ
+锘縩amespace Gs.DevApp.DevFrm.Rpt
{
partial class SetLB
{
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs
index 974d0af..aa12d3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs
@@ -1,8 +1,19 @@
-锘縰sing System;
-using System.Collections.Generic;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.JJGZ
+namespace Gs.DevApp.DevFrm.Rpt
{
public partial class SetLB : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
index 24abcde..be85bcf 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.PDA
+锘縩amespace Gs.DevApp.DevFrm.PDA
{
partial class Frm_UserBind
{
@@ -117,7 +115,7 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1422,7 +1420,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index 9b98969..27a8dc3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.QC
{
partial class Frm_IQCLookups
@@ -54,7 +51,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -562,7 +559,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
index 0687463..f9d707e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -1,10 +1,10 @@
锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using MES.Service.Modes;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Text;
-using Gs.DevApp.DevFrm.QC.Models;
namespace Gs.DevApp.DevFrm.QC
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 810f48f..7fea474 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.QC
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesQaItemsDetect01
{
@@ -94,7 +91,7 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2621,7 +2618,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index a593e4c..80bd659 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,17 +1,22 @@
+using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
+using DevExpress.XtraLayout.Customization;
+using DevExpress.XtraRichEdit.API.Native;
+using Gs.DevApp.DevFrm.QC;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Net;
using System.Threading.Tasks;
+using System.Timers;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm.QC
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index c38f6cc..2e9ad1e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.QC
{
partial class Frm_MesQaMj
@@ -60,7 +57,7 @@
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -805,7 +802,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 7603cf5..155a95d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.QC
{
partial class Frm_MesQmAql1
@@ -66,7 +63,7 @@
this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2160,7 +2157,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_fversion;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 5b3e9e4..1e28b6e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.QC
{
partial class Frm_MesSysLookups
@@ -54,7 +51,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -562,7 +559,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 243883e..687f828 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.QC
+锘縩amespace Gs.DevApp.DevFrm.QC
{
partial class Jyxm
{
@@ -63,7 +61,7 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -1319,7 +1317,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 0c5ef81..8df823b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -3,6 +3,7 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
+using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -11,7 +12,6 @@
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.DevFrm.QC.Models;
namespace Gs.DevApp.DevFrm.QC
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
index 82205d0..a4e60e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.QC
+锘縩amespace Gs.DevApp.DevFrm.QC
{
partial class JyxmShow
{
@@ -36,7 +34,7 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -233,7 +231,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
index 77e6867..76ab316 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.QC
+锘縩amespace Gs.DevApp.DevFrm.QC
{
partial class JyxmShowCopy
{
@@ -78,7 +76,7 @@
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.panBom = new DevExpress.XtraEditors.PanelControl();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
@@ -826,7 +824,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index b92c7c0..251c1c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.QC
+锘縩amespace Gs.DevApp.DevFrm.QC
{
partial class MesQcExceptional
{
@@ -68,7 +66,7 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -111,29 +109,19 @@
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = 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.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
- this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
- this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
- this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -182,9 +170,6 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
@@ -193,13 +178,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -211,10 +192,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -222,11 +202,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -235,9 +214,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -246,7 +224,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -259,19 +236,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(985, 442);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(985, 402);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -281,7 +256,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 39;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
this.gridColumn4,
@@ -299,10 +274,10 @@
this.gridColumn3,
this.gridColumn17,
this.gridColumn18,
- this.gridColumn19});
- this.gridView1.DetailHeight = 272;
+ this.gridColumn19,
+ this.gridColumn20});
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 44;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -313,202 +288,194 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳";
this.gv_fstatus.FieldName = "chkStatus";
- this.gv_fstatus.MaxWidth = 44;
- this.gv_fstatus.MinWidth = 44;
+ this.gv_fstatus.MaxWidth = 50;
+ this.gv_fstatus.MinWidth = 50;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 44;
+ this.gv_fstatus.Width = 50;
//
// gridColumn4
//
this.gridColumn4.Caption = "涓婚敭GUID";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 17;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "org.fnamber";
- this.gridColumn4.Width = 219;
+ this.gridColumn4.Width = 250;
//
// gridColumn1
//
this.gridColumn1.Caption = "绫诲埆";
this.gridColumn1.FieldName = "fType";
- this.gridColumn1.MinWidth = 22;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 15;
- this.gridColumn1.Width = 82;
+ this.gridColumn1.VisibleIndex = 14;
+ this.gridColumn1.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 17;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
- this.gridColumn2.Width = 131;
+ this.gridColumn2.Width = 150;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "寤虹珛鏃堕棿";
this.gv_checkUser.FieldName = "createDate";
- this.gv_checkUser.MinWidth = 17;
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 = 11;
- this.gv_checkUser.Width = 82;
+ this.gv_checkUser.Width = 94;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鑰�";
this.gv_checkDate.FieldName = "checkBy";
- this.gv_checkDate.MinWidth = 17;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 12;
- this.gv_checkDate.Width = 157;
+ this.gv_checkDate.Width = 180;
//
// gv_pba005
//
this.gv_pba005.AppearanceCell.Options.UseFont = true;
this.gv_pba005.Caption = "瀹℃牳鏃堕棿";
this.gv_pba005.FieldName = "checkDate";
- this.gv_pba005.MinWidth = 17;
this.gv_pba005.Name = "gv_pba005";
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
this.gv_pba005.VisibleIndex = 13;
- this.gv_pba005.Width = 82;
+ this.gv_pba005.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栫爜";
this.gridColumn8.FieldName = "itemNo";
- this.gridColumn8.MinWidth = 22;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 82;
+ this.gridColumn8.Width = 94;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
this.gridColumn9.FieldName = "itemName";
- this.gridColumn9.MinWidth = 22;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 82;
+ this.gridColumn9.Width = 94;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
this.gridColumn10.FieldName = "itemModel";
- this.gridColumn10.MinWidth = 22;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 7;
- this.gridColumn10.Width = 82;
+ this.gridColumn10.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "渚涘簲鍟�";
this.gridColumn11.FieldName = "gysName";
- this.gridColumn11.MinWidth = 22;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 8;
- this.gridColumn11.Width = 82;
+ this.gridColumn11.Width = 94;
//
// gridColumn12
//
this.gridColumn12.Caption = "鍒拌揣鏃ユ湡";
this.gridColumn12.FieldName = "dhdDate";
- this.gridColumn12.MinWidth = 22;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
- this.gridColumn12.Width = 82;
+ this.gridColumn12.Width = 94;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍒拌揣鍗曞彿";
this.gridColumn13.FieldName = "dhdNo";
- this.gridColumn13.MinWidth = 22;
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 3;
- this.gridColumn13.Width = 82;
+ this.gridColumn13.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡ID";
this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 22;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 14;
- this.gridColumn3.Width = 82;
+ this.gridColumn3.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "寮傚父鍗曞彿";
this.gridColumn17.FieldName = "fBillNo";
- this.gridColumn17.MinWidth = 22;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 1;
- this.gridColumn17.Width = 82;
+ this.gridColumn17.Width = 94;
//
// gridColumn18
//
this.gridColumn18.Caption = "OA澶勭悊鐘舵��";
this.gridColumn18.FieldName = "oaCheckStatusTxt";
- this.gridColumn18.MinWidth = 22;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 2;
- this.gridColumn18.Width = 82;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "OA澶勭悊鏃堕棿";
this.gridColumn19.FieldName = "oaCheckDate";
- this.gridColumn19.MinWidth = 22;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 82;
+ this.gridColumn19.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 402);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(985, 30);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -516,7 +483,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -529,8 +495,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(985, 442);
- this.splitMx1.SplitterPosition = 127;
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 163;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -552,119 +518,107 @@
this.layoutControlItem9,
this.layoutControlItem24});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(985, 127);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 163);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(735, 77);
+ this.lbGuid.Location = new System.Drawing.Point(840, 99);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(240, 31);
+ this.lbGuid.Size = new System.Drawing.Size(274, 40);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(795, 12);
- this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_fType.Location = new System.Drawing.Point(927, 12);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(161, 20);
+ this.txt_fType.Size = new System.Drawing.Size(187, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 36);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(161, 20);
+ this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(321, 36);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_itemName.Location = new System.Drawing.Point(375, 40);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(161, 20);
+ this.txt_itemName.Size = new System.Drawing.Size(185, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(558, 36);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_itemModel.Location = new System.Drawing.Point(651, 40);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(398, 20);
+ this.txt_itemModel.Size = new System.Drawing.Size(463, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(321, 12);
- this.txt_dhdNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_dhdNo.Location = new System.Drawing.Point(375, 12);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(161, 20);
+ this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(84, 60);
- this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_gysNo.Location = new System.Drawing.Point(99, 68);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(161, 20);
+ this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(321, 60);
- this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_gysName.Location = new System.Drawing.Point(375, 68);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(398, 20);
+ this.txt_gysName.Size = new System.Drawing.Size(461, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(811, 140);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_guid.Location = new System.Drawing.Point(927, 180);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(164, 20);
+ this.txt_guid.Size = new System.Drawing.Size(187, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 477;
//
// txt_fBillNo
//
- this.txt_fBillNo.Location = new System.Drawing.Point(84, 12);
- this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(161, 20);
+ this.txt_fBillNo.Size = new System.Drawing.Size(185, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_dhdDate
//
- this.txt_dhdDate.Location = new System.Drawing.Point(558, 12);
- this.txt_dhdDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_dhdDate.Location = new System.Drawing.Point(651, 12);
this.txt_dhdDate.Name = "txt_dhdDate";
- this.txt_dhdDate.Size = new System.Drawing.Size(161, 20);
+ this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
this.txt_dhdDate.StyleController = this.layoutMx1;
this.txt_dhdDate.TabIndex = 481;
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(84, 84);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_fngDesc.Location = new System.Drawing.Point(99, 97);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(872, 44);
+ this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 485;
//
@@ -689,7 +643,7 @@
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem24.Size = new System.Drawing.Size(278, 34);
this.layoutControlItem24.Text = "涓婚敭Guid";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(44, 16);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(50, 20);
//
// Root
//
@@ -737,7 +691,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(968, 140);
+ this.Root.Size = new System.Drawing.Size(1126, 163);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -745,115 +699,114 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(237, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_dhdDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(474, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 24);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(711, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(237, 24);
+ this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(474, 24);
+ this.layoutControlItem13.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(474, 24);
+ this.layoutControlItem13.Size = new System.Drawing.Size(554, 28);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 48);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(237, 24);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(237, 48);
+ this.layoutControlItem16.Location = new System.Drawing.Point(276, 56);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(474, 24);
+ this.layoutControlItem16.Size = new System.Drawing.Size(552, 29);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fngDesc;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(948, 48);
+ this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
this.layoutControlItem3.Text = "寮傚父鎻忚堪";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(985, 305);
+ this.tabMx.Size = new System.Drawing.Size(1126, 395);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -861,31 +814,23 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(983, 279);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 363);
this.tabMxPage1.Text = "寮傚父鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
this.rptJYBZ,
- this.repositoryItemDateEdit3,
- this.repositoryItemLookUpEdit1,
- this.repositoryItemComboBox1,
- this.repositoryItemSearchLookUpEdit1,
- this.repositoryItemComboBox2,
- this.repositoryItemComboBox3});
- this.gcMx1.Size = new System.Drawing.Size(983, 279);
+ this.repositoryItemDateEdit3});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 363);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -894,7 +839,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 39;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
@@ -908,12 +853,7 @@
this.gvMx1reporttime,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn16,
- this.gridColumn20,
- this.gridColumn21,
- this.gridColumn22,
- this.gridColumn23});
- this.gvMx1.DetailHeight = 272;
+ this.gridColumn16});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -925,126 +865,115 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 44;
+ this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 82;
+ this.gvMx1guid.Width = 94;
//
// caaGuid
//
this.caaGuid.Caption = "鐖朵翰GUID";
this.caaGuid.FieldName = "pGuid";
- this.caaGuid.MinWidth = 22;
+ this.caaGuid.MinWidth = 25;
this.caaGuid.Name = "caaGuid";
this.caaGuid.OptionsColumn.ReadOnly = true;
- this.caaGuid.Width = 82;
+ this.caaGuid.Width = 94;
//
// gvMx1daa002
//
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "搴忓彿";
this.gvMx1daa002.FieldName = "fSeq";
- this.gvMx1daa002.MinWidth = 44;
+ this.gvMx1daa002.MinWidth = 50;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 44;
+ this.gvMx1daa002.Width = 50;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠屽崟鍙�";
this.gridColumn5.FieldName = "releaseNo";
- this.gridColumn5.MinWidth = 22;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 82;
+ this.gridColumn5.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "妫�楠屾棩鏈�";
this.gridColumn6.FieldName = "jyDate";
- this.gridColumn6.MinWidth = 22;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 82;
+ this.gridColumn6.Width = 94;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鎵规鏁伴噺";
this.gvMx1daa005.FieldName = "batchQty";
- this.gvMx1daa005.MinWidth = 44;
+ this.gvMx1daa005.MinWidth = 50;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 44;
+ this.gvMx1daa005.Width = 50;
//
// gridColumn7
//
this.gridColumn7.Caption = "鎶芥牱鏁�";
this.gridColumn7.FieldName = "chouQty";
- this.gridColumn7.MinWidth = 22;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 3;
- this.gridColumn7.Width = 82;
+ this.gridColumn7.Width = 94;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "涓嶈壇鏁�";
this.gvMx1daa004.FieldName = "badQty";
- this.gvMx1daa004.MinWidth = 44;
+ this.gvMx1daa004.MinWidth = 50;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 5;
- this.gvMx1daa004.Width = 44;
+ this.gvMx1daa004.Width = 50;
//
// gvMx1daa008
//
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "涓嶈壇鐜�";
this.gvMx1daa008.FieldName = "badProb";
- this.gvMx1daa008.MaxWidth = 44;
- this.gvMx1daa008.MinWidth = 44;
+ this.gvMx1daa008.MaxWidth = 50;
+ this.gvMx1daa008.MinWidth = 50;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 6;
- this.gvMx1daa008.Width = 44;
+ this.gvMx1daa008.Width = 50;
//
// gvMx1reporttime
//
this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷";
- this.gvMx1reporttime.ColumnEdit = this.repositoryItemComboBox2;
this.gvMx1reporttime.FieldName = "chooseType";
- this.gvMx1reporttime.MinWidth = 44;
+ this.gvMx1reporttime.MinWidth = 50;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 7;
- this.gvMx1reporttime.Width = 89;
- //
- // repositoryItemComboBox2
- //
- this.repositoryItemComboBox2.AutoHeight = false;
- this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox2.Items.AddRange(new object[] {
- "閫夊埆绫诲埆1",
- "閫夊埆绫诲埆2"});
- this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+ this.gvMx1reporttime.Width = 102;
//
// gridColumn14
//
@@ -1053,97 +982,32 @@
this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn14.Caption = "澶勭疆鎰忚";
- this.gridColumn14.ColumnEdit = this.repositoryItemComboBox1;
this.gridColumn14.FieldName = "handResult";
- this.gridColumn14.MinWidth = 22;
+ this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
- new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "1"),
- new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "2")});
- this.gridColumn14.Tag = "edit";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 82;
- //
- // repositoryItemComboBox1
- //
- this.repositoryItemComboBox1.AutoHeight = false;
- this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox1.Items.AddRange(new object[] {
- "閫�璐�",
- "鐗归噰鐩存帴浣跨敤"});
- this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.gridColumn14.Width = 94;
//
// gridColumn15
//
this.gridColumn15.Caption = "閫夊埆鏁伴噺";
this.gridColumn15.FieldName = "chooseQty";
- this.gridColumn15.MinWidth = 22;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 10;
- this.gridColumn15.Width = 82;
+ this.gridColumn15.VisibleIndex = 9;
+ this.gridColumn15.Width = 94;
//
// gridColumn16
//
this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�";
this.gridColumn16.FieldName = "fngDesc";
- this.gridColumn16.MinWidth = 22;
+ this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 11;
- this.gridColumn16.Width = 82;
- //
- // gridColumn20
- //
- this.gridColumn20.Caption = "鍚堟牸鍏ュ簱鏁�";
- this.gridColumn20.FieldName = "okRkqty";
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Tag = "";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 12;
- this.gridColumn20.Width = 66;
- //
- // gridColumn21
- //
- this.gridColumn21.Caption = "宸ュ簾鍏ュ簱鏁�";
- this.gridColumn21.FieldName = "gfRkqty";
- this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Tag = "edit";
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 13;
- this.gridColumn21.Width = 66;
- //
- // gridColumn22
- //
- this.gridColumn22.Caption = "鏂欏簾鍏ュ簱鏁�";
- this.gridColumn22.FieldName = "lfRkqty";
- this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Tag = "edit";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
- this.gridColumn22.Width = 66;
- //
- // gridColumn23
- //
- this.gridColumn23.Caption = "閫�鏂欐柟寮�";
- this.gridColumn23.ColumnEdit = this.repositoryItemComboBox3;
- this.gridColumn23.FieldName = "process";
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Tag = "edit";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 9;
- //
- // repositoryItemComboBox3
- //
- this.repositoryItemComboBox3.AutoHeight = false;
- this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox3.Items.AddRange(new object[] {
- "閫�鏂欒ˉ鏂�",
- "閫�鏂欏苟鎵ｆ"});
- this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+ this.gridColumn16.VisibleIndex = 10;
+ this.gridColumn16.Width = 94;
//
// repositoryItemDateEdit1
//
@@ -1191,34 +1055,11 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
//
- // repositoryItemLookUpEdit1
- //
- this.repositoryItemLookUpEdit1.AutoHeight = false;
- this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1";
- //
- // repositoryItemSearchLookUpEdit1
- //
- this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
- this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
- this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
- //
- // repositoryItemSearchLookUpEdit1View
- //
- this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
- this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
- this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
- this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
- //
// picCheckBox
//
- this.picCheckBox.Location = new System.Drawing.Point(896, 43);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1238,15 +1079,24 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn20.FieldName = "fSubsidiary";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 15;
+ this.gridColumn20.Width = 94;
+ //
// MesQcExceptional
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(987, 530);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "MesQcExceptional";
this.Text = "IQC寮傚父鎶ュ憡";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1297,9 +1147,6 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
@@ -1308,13 +1155,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -1333,7 +1176,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -1398,15 +1241,5 @@
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;
- private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
- private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
- private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
- private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index ddf3ed8..d2c2e0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -6,10 +6,8 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm.QC
{
@@ -30,14 +28,8 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
- toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -53,10 +45,6 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
-
-
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -136,7 +124,7 @@
}
}
/// <summary>
- /// 瀹℃牳浜嬩欢
+ /// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -144,164 +132,6 @@
{
_toolCk(1);
}
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- _toolCk(0);
- }
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
- }
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender">浜嬩欢鍙戦�佽��</param>
- /// <param name="e">浜嬩欢鍙傛暟</param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- // 璁剧疆褰撳墠鎿嶄綔妯″紡涓虹紪杈戠姸鎬�
- toolBarMenu1.currentAction = "edit";
- // 瀹氫箟鍙橀噺瀛樺偍閫変腑琛岀殑鍞竴鏍囪瘑鍜屽悕绉�
- string rowGuid = "", rowName = "";
- // 浠庡綋鍓嶆椿鍔ㄨ〃鏍间腑鑾峰彇閫変腑琛岀殑鍏抽敭淇℃伅
- // 鍙傛暟璇存槑锛�
- // - xtraTabControl1锛氭爣绛鹃〉鎺т欢锛岀敤浜庣‘瀹氬綋鍓嶆椿鍔ㄩ〉
- // - lbGuid锛氭樉绀篏UID鐨勬爣绛炬帶浠�
- // - txt_releaseNo锛氭樉绀哄彂甯冪紪鍙风殑鏂囨湰妗�
- // - gridView1锛氫富琛ㄦ牸瑙嗗浘
- // - "releaseNo"锛氳鑾峰彇鐨勫垪鍚�
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
- // 楠岃瘉鏄惁閫変腑鏈夋晥琛�
- if (string.IsNullOrEmpty(rowGuid))
- {
- // 鏈�変腑鏃舵彁绀虹敤鎴峰苟缁堟鎿嶄綔
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- // 瀵艰埅鍒扮紪杈戦〉闈�(绗�4涓爣绛鹃〉锛岀储寮曚粠0寮�濮�)
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- // 鏍规嵁褰撳墠娲诲姩鏍囩椤垫墽琛屼笉鍚岀殑鍒濆鍖栭�昏緫
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- // 濡傛灉鏄壒瀹氭爣绛鹃〉(绗�2椤�)锛屽姞杞藉畬鏁存暟鎹ā鍨�
- // 鍙傛暟璇存槑锛�
- // - rowGuid锛氶�変腑琛岀殑鍞竴鏍囪瘑
- getModel(rowGuid);
- }
- else
- {
- // 鍏朵粬鏍囩椤电殑缂栬緫妯″紡鍒濆鍖�
- // 鍒涘缓闇�瑕佺壒娈婂鐞嗙殑琛ㄦ牸瑙嗗浘鍒楄〃
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1); // 娣诲姞鏄庣粏琛ㄨ鍥�1
-
- // 鍚敤缂栬緫妯″紡涓嬬殑鎵�鏈夋帶浠�
- // 鍙傛暟璇存槑锛�
- // - this.layoutMx1.Controls锛氳鍚敤鐨勬帶浠跺鍣�
- // - true锛氬惎鐢ㄦ爣蹇�
- // - gvList锛氶渶瑕佺壒娈婂鐞嗙殑琛ㄦ牸瑙嗗浘鍒楄〃
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
-
-
- }
- }
-
- /// <summary>
- /// 淇濆瓨 -鎸夐挳鐐瑰嚮浜嬩欢 澶勭悊寮傚父鍗曟槑缁嗙殑淇濆瓨閫昏緫
- /// </summary>
- /// <param name="sender">浜嬩欢鍙戦�佽��</param>
- /// <param name="e">浜嬩欢鍙傛暟</param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- // 1. 鍒濆鍖栦繚瀛樼姸鎬�
- toolBarMenu1.isSetBtn = false; // 绂佺敤宸ュ叿鏍忔寜閽姸鎬佽缃�
- // 2. 鏋勫缓璇锋眰瀵硅薄
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓昏〃涓诲缓
- list = new List<dynamic>(), // 鏄庣粏鏁版嵁鍒楄〃
- };
- // 3. 鏁版嵁楠岃瘉涓庡噯澶�
- gvMx1.CloseEditor(); // 鍏抽棴娲诲姩缂栬緫鍣�
- gvMx1.PostEditor(); // 鎻愪氦缂栬緫鐨勫��
- gvMx1.UpdateCurrentRow(); // 鏇存柊褰撳墠琛屾暟鎹�
- // 楠岃瘉鏄庣粏鏄惁涓虹┖
- if (gvMx1.DataRowCount <= 0)
- {
- MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑寮傚父鍗曟槑缁嗭紒");
- return;
- }
- // 4. 鏀堕泦鏄庣粏鏁版嵁
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
-
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- {
- // 鑾峰彇褰撳墠鏄庣粏琛岀殑GUID
- Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- // 娣诲姞鏄庣粏椤瑰埌璇锋眰瀵硅薄
- _obj.list.Add(new
- {
- Guid = _guid,
- BatchQty = (row["batchQty"].ToString()), // 鎵规鏁伴噺
- GfRkqty = (row["gfRkqty"].ToString()), // 鍚堟牸鍏ュ簱鏁伴噺
- LfRkqtyz = (row["lfRkqty"].ToString()), // 涓嶅悎鏍煎叆搴撴暟閲�
- HandResult = (row["handResult"].ToString()), // 閫夊埆绫诲瀷
- ChooseType = (row["chooseType"].ToString()), // 澶勭悊鎰忚
- Process = (row["process"].ToString()), // 閫�鏂欐柟寮�
-
- });
- }
- }
- // 5. 鍙戦�佷繚瀛樿姹�
- try
- {
- // 搴忓垪鍖栧璞″苟璋冪敤WebService
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- // 瑙ｆ瀽杩斿洖缁撴灉
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // 6. 澶勭悊淇濆瓨鎴愬姛閫昏緫
- if (_rtn.rtnCode > 0)
- {
- // 鏇存柊涓昏〃GUID
- lbGuid.Text = _rtn.rtnData.outGuid;
- // 鎭㈠宸ュ叿鏍忕姸鎬�
- toolBarMenu1.isSetBtn = true;
- // 绂佺敤缂栬緫鎺т欢
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
- // 閲嶇疆鎿嶄綔鐘舵��
- toolBarMenu1.currentAction = "";
- // 銆愭柊澧炲埛鏂伴�昏緫銆戜繚瀛樻垚鍔熷悗绔嬪嵆鍒锋柊褰撳墠妯″瀷鏁版嵁鍜屽垪琛�
- // 鍒锋柊褰撳墠鍗曟嵁璇︽儏
- getModel(lbGuid.Text.Trim());
- // 鍒锋柊鍒楄〃椤垫暟鎹�
- getPageList(this.pageBar1.CurrentPage);
-
- // 璺宠浆鍒版煡鐪嬬粨鏋滈〉闈�
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
/// <summary>
///
@@ -310,7 +140,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and arn.ReceiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -343,156 +177,78 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
/// <summary>
- /// 璇诲彇瀹炰綋鏁版嵁锛堟牴鎹敮涓�鏍囪瘑GUID鍔犺浇璇︽儏锛屽苟灏嗘暟鎹粦瀹氬埌鐣岄潰鎺т欢锛�
- /// 鍔熻兘锛氫粠鏈嶅姟绔幏鍙栨寚瀹氳川閲忔帶鍒跺紓甯歌褰曠殑璇︾粏淇℃伅锛屽寘鎷富鏁版嵁鍜屾槑缁嗘暟鎹紝
- /// 骞舵牴鎹搷浣滅姸鎬侊紙鏌ョ湅/缂栬緫锛夎缃晫闈㈡帶浠剁殑鍙紪杈戞��
+ /// 璇诲彇瀹炰綋
/// </summary>
- /// <param name="strGuid">瀹炰綋鐨勫敮涓�鏍囪瘑锛圙UID鏍煎紡鐨勪富閿紝鐢ㄤ簬瀹氫綅鍏蜂綋璁板綍锛�</param>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
- // 瀹氫箟鍙橀噺鏍囪褰撳墠鏄惁涓虹紪杈戠姸鎬侊紙榛樿闈炵紪杈戠姸鎬侊級
bool isEdit = false;
-
- // 鑻ュ綋鍓嶅伐鍏锋爮鎿嶄綔鏄�"鏂板"锛坅dd锛夛紝鏃犻渶鍔犺浇宸叉湁鏁版嵁锛岀洿鎺ヨ繑鍥�
- // 鍘熷洜锛氭柊澧炵姸鎬佷笅搴旀樉绀虹┖鐧借〃鍗曪紝鑰岄潪鍔犺浇鍘嗗彶鏁版嵁
if (toolBarMenu1.currentAction == "add") return;
-
- // 鑻ュ綋鍓嶅伐鍏锋爮鎿嶄綔鏄�"缂栬緫"锛坋dit锛夛紝灏嗙紪杈戠姸鎬佹爣璁颁负true
- // 鍚庣画鐣岄潰鎺т欢鐨勫彲缂栬緫鎬у皢鍩轰簬姝ゅ彉閲忓垽鏂�
if (toolBarMenu1.currentAction == "edit") isEdit = true;
-
- // 鏍￠獙鍙傛暟锛氳嫢鏈紶鍏ユ湁鏁堢殑GUID锛堢敤鎴锋湭閫夋嫨浠讳綍琛岋級锛屾彁绀虹敤鎴峰苟缁堟鎵ц
if (string.IsNullOrEmpty(strGuid))
{
- // 寮瑰嚭璀﹀憡鎻愮ず妗嗭紝寮曞鐢ㄦ埛鍏堥�夋嫨鎿嶄綔琛�
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- // 鏋勫缓璇锋眰鍙傛暟瀵硅薄锛氫互鍖垮悕绫诲舰寮忓皝瑁呰鏌ヨ鐨勫疄浣撲富閿紙GUID锛�
- // 璇ュ弬鏁板皢鐢ㄤ簬鍚戞湇鍔＄璇锋眰瀵瑰簲鐨勫疄浣撴暟鎹�
var _obj = new
{
- guid = strGuid,// 涓婚敭瀛楁锛屾湇鍔＄閫氳繃姝ゅ�煎畾浣嶅叿浣撹褰�
+ guid = strGuid,//涓诲缓
};
-
try
{
- // 璋冪敤HTTP宸ュ叿绫诲彂閫丳OST璇锋眰锛岃幏鍙栨湇鍔＄杩斿洖鐨凧SON鏁版嵁
- // 鍙傛暟璇存槑锛�
- // 绗竴涓弬鏁帮細绌哄瓧绗︿覆锛堝熀纭�URL鍙兘鍦║tilityHelper鍐呴儴棰勮锛�
- // 绗簩涓弬鏁帮細鎺ュ彛璺緞锛堢粨鍚坃webServiceName鍓嶇紑锛屽畬鏁磋矾寰勪负"MesQcExceptionalManager/GetModel"锛�
- // 绗笁涓弬鏁帮細灏嗘煡璇㈠弬鏁板簭鍒楀寲涓篔SON瀛楃涓�
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-
- // 灏嗘湇鍔＄杩斿洖鐨凧SON瀛楃涓茶浆鎹负閫氱敤杩斿洖妯″瀷锛圧eturnModel锛�
- // ReturnModel鍖呭惈鐘舵�佺爜锛坮tnCode锛夈�佹秷鎭紙rtnMsg锛夈�佹暟鎹紙rtnData锛変笁涓牳蹇冨瓧娈�
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
- // 妫�鏌ユ湇鍔＄杩斿洖鐘舵�侊細rtnCode > 0 琛ㄧず璇锋眰鎴愬姛锛堜笟鍔″眰闈㈢殑鎴愬姛锛�
if (_rtn.rtnCode > 0)
{
- // 鎻愬彇杩斿洖鏁版嵁涓殑瀹炰綋璇︽儏锛坉ynamic绫诲瀷鍙姩鎬佽闂瓧娈碉紝鏃犻渶棰勫厛瀹氫箟瀹炰綋绫伙級
dynamic dy = _rtn.rtnData;
-
- // 鍦ㄧ晫闈㈢殑lbGuid鏍囩涓婃樉绀哄綋鍓嶅疄浣撶殑GUID锛堢敤浜庢爣璇嗗綋鍓嶆搷浣滅殑璁板綍锛�
lbGuid.Text = strGuid;
-
- // 鍒涘缓缃戞牸瑙嗗浘鍒楄〃锛屽寘鍚渶瑕佸鐞嗙殑鏄庣粏缃戞牸瑙嗗浘gvMx1
- // 鍚庣画灏嗛�氳繃宸ュ叿鏂规硶缁熶竴璁剧疆杩欎簺缃戞牸鐨勫睘鎬э紙濡傚彲缂栬緫鎬э級
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
-
- // 璋冪敤宸ュ叿鏂规硶鎵归噺璁剧疆鐣岄潰鎺т欢鐨勫�煎拰鍙紪杈戠姸鎬�
- // 鍙傛暟璇存槑锛�
- // this.layoutMx1.Controls锛氬竷灞�瀹瑰櫒涓殑鎵�鏈夋帶浠讹紙鏂囨湰妗嗐�佷笅鎷夋绛夛級
- // dy锛氭湇鍔＄杩斿洖鐨勫疄浣撴暟鎹紙鐢ㄤ簬涓烘帶浠惰祴鍊硷級
- // isEdit锛氭槸鍚︿负缂栬緫鐘舵�侊紙鎺у埗鎺т欢鏄惁鍙紪杈戯級
- // gvList锛氶渶瑕佸悓姝ヨ缃殑缃戞牸瑙嗗浘鍒楄〃
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-
-
- // 瑙ｆ瀽鏈嶅姟绔繑鍥炵殑JSON锛屾彁鍙栨槑缁嗘暟鎹垪琛紙瀛樺偍鍦╮tnData涓嬬殑list瀛楁涓級
- // 浣跨敤JObject瑙ｆ瀽JSON锛屼究浜庢彁鍙栧祵濂楃粨鏋勭殑鏁版嵁
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
- // 閬嶅巻list鏁扮粍涓殑鎵�鏈夊厓绱狅紝娣诲姞鍒版柊鐨凧Array涓紙绛涢�夋槑缁嗘暟鎹級
foreach (var a in _job["rtnData"]["list"])
{
array.Add(a);
}
-
- // 灏嗘槑缁嗘暟鎹殑JSON鏁扮粍杞崲涓篋ataTable锛堥�傚悎浣滀负缃戞牸鎺т欢鐨勬暟鎹簮锛�
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-
- // 鑻ユ槑缁嗘暟鎹瓨鍦紙DataTable琛屾暟>0锛�
if (dt.Rows.Count > 0)
{
- // 涓虹綉鏍兼帶浠秅cMx1璁剧疆鏂扮殑缁戝畾涓婁笅鏂囷紙BindingContext锛�
- // 鐩殑锛氶伩鍏嶄笌鍏朵粬鎺т欢鍏变韩缁戝畾涓婁笅鏂囧鑷寸殑鏁版嵁鍒锋柊鍐茬獊
gcMx1.BindingContext = new BindingContext();
- // 灏嗘槑缁嗘暟鎹粦瀹氬埌缃戞牸鎺т欢gcMx1锛坓cMx1鏄疓ridControl锛実vMx1鏄叾瀵瑰簲鐨勮鍥撅級
gcMx1.DataSource = dt;
- // 寮哄埗鍒濆鍖栫綉鏍兼帶浠讹紙纭繚鍒楄缃�佹牱寮忕瓑鐢熸晥锛�
gcMx1.ForceInitialize();
- // 鑷姩璋冩暣缃戞牸鍒楀锛屼娇鍒楀唴瀹瑰畬鍏ㄦ樉绀猴紙浼樺寲瑙嗚鏁堟灉锛�
gvMx1.BestFitColumns();
- // 璋冪敤宸ュ叿鏂规硶璁剧疆缃戞牸甯冨眬锛堝闄愬埗鏈�澶у垪瀹斤紝閬垮厤鍒楄繃瀹藉鑷寸晫闈㈡贩涔憋級
+
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
- // 鑻ユ槑缁嗘暟鎹笉瀛樺湪锛堟棤璁板綍锛�
else
{
- // 璋冪敤宸ュ叿鏂规硶璁剧疆榛樿鐨勭綉鏍肩粨鏋勶紙濡傜┖琛ㄦ椂鏄剧ず鍒楁爣棰樹絾鏃犳暟鎹锛�
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
}
- // 鏈嶅姟绔繑鍥炲け璐ョ姸鎬侊紙rtnCode <= 0锛夛紝鏄剧ず鏈嶅姟绔繑鍥炵殑閿欒娑堟伅
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
- // 鎹曡幏鎵ц杩囩▼涓殑寮傚父锛堝缃戠粶閿欒銆丣SON瑙ｆ瀽澶辫触绛夛級
catch (Exception ex)
{
- // 鏄剧ず寮傚父淇℃伅锛屼究浜庤皟璇曞拰鐢ㄦ埛鍙嶉
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
/// <summary>
-
+ ///
+ /// </summary>
+ /// <param name="inFieldValue"></param>
private void _toolCk(int _inFieldValue)
{
- //toolBarMenu1.guidKey = "";
- //string rowGuid, rowName;
- //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- // lbGuid, txt_fBillNo, gridView1, "fBillNo");
- //toolBarMenu1.guidKey = rowGuid;
- //if (string.IsNullOrEmpty(rowGuid))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
- // return;
- //var frm = new MesQcExceptionalShow(rowGuid);
- //frm.UpdateParent += (s, e) =>
- //{
- // int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- // gridView1.FocusedRowHandle = rowHandle;
- // UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
- //};
- //frm.ShowDialog();
- //return;
string strMsg = "";
switch (_inFieldValue)
{
@@ -520,12 +276,13 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -534,14 +291,13 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
index 9f852af..5160e8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
@@ -120,7 +120,4 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>93, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
index bd3a3e0..2933676 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.QC.Models
+namespace MES.Service.Modes
{
/// <summary>
/// 缂洪櫡浠ｇ爜琛�
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
index e8e786b..a7a16d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
@@ -1,7 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
-namespace Gs.DevApp.DevFrm.QC.Models
+namespace MES.Service.Modes
{
/// <summary>
/// IQC銆丱QC妫�楠岄」鐩�
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index 56d2fa0..858afe1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.QC.Models
+namespace MES.Service.Modes
{
/// <summary>
/// 妫�楠岄」鐩粠琛�
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 38c0b28..50bd956 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesInvItemArn
{
@@ -77,7 +74,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1531,7 +1528,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 0f261a5..24aeadc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,18 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesInvItemArn : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index afd6e5c..f593a29 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesInvItemIns
{
@@ -66,7 +63,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1446,7 +1443,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 06743de..b94876f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesInvItemIns : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 99a071f..107801e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemQtrk
{
@@ -34,36 +31,36 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
- 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();
- 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.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -89,7 +86,7 @@
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -183,11 +180,11 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -221,6 +218,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -423,7 +421,8 @@
this.gridColumn24,
this.gridColumn25,
this.gridColumn26,
- this.gridColumn27});
+ this.gridColumn27,
+ this.gridColumn28});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -480,7 +479,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 12;
+ this.gv_qt003.VisibleIndex = 13;
this.gv_qt003.Width = 94;
//
// gv_qt019
@@ -493,7 +492,7 @@
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 13;
+ this.gv_qt019.VisibleIndex = 14;
this.gv_qt019.Width = 94;
//
// gv_qt005
@@ -506,7 +505,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 4;
+ this.gv_qt005.VisibleIndex = 5;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -519,7 +518,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 5;
+ this.gv_qt001.VisibleIndex = 6;
this.gv_qt001.Width = 200;
//
// gv_qt016
@@ -532,7 +531,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 9;
+ this.gv_qt016.VisibleIndex = 10;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -545,7 +544,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 10;
+ this.gv_qt002.VisibleIndex = 11;
this.gv_qt002.Width = 180;
//
// gv_qt010
@@ -558,7 +557,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 11;
+ this.gv_qt010.VisibleIndex = 12;
this.gv_qt010.Width = 94;
//
// gridColumn13
@@ -568,7 +567,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 14;
+ this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -578,7 +577,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 15;
+ this.gridColumn14.VisibleIndex = 16;
this.gridColumn14.Width = 94;
//
// gridColumn21
@@ -588,7 +587,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 16;
+ this.gridColumn21.VisibleIndex = 17;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -598,7 +597,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 6;
+ this.gridColumn22.VisibleIndex = 7;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -608,7 +607,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 7;
+ this.gridColumn23.VisibleIndex = 8;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -618,7 +617,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 8;
+ this.gridColumn24.VisibleIndex = 9;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -974,9 +973,11 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_qtlx.Properties.Items.AddRange(new object[] {
"璇烽�夋嫨",
- "1:渚涘簲鍟嗚禒閫�",
- "2:鍞悗缁翠慨",
- "3:鎷嗗嵏鍏ュ簱"});
+ "1:鍞悗缁翠慨",
+ "2:鎷嗗嵏鍏ュ簱",
+ "3:渚涘簲鍟嗚禒閫�",
+ "4:鏃犳簮鍗曞澶栭��鏉愭枡",
+ "5:鐩樼泩"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1057,38 +1058,38 @@
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- 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;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16});
this.Root.Size = new System.Drawing.Size(1332, 207);
this.Root.TextVisible = false;
//
@@ -1462,17 +1463,17 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition17});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
@@ -1596,29 +1597,29 @@
this.layoutControlItem31});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
+ rowDefinition18,
+ rowDefinition19,
+ rowDefinition20});
this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1838,15 +1839,53 @@
// gridView2
//
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn7});
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐗╂枡ID";
+ this.gridColumn8.FieldName = "id";
+ this.gridColumn8.MinWidth = 80;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Width = 80;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn9.FieldName = "itemNo";
+ this.gridColumn9.MinWidth = 100;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 1;
+ this.gridColumn9.Width = 100;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn10.FieldName = "itemName";
+ this.gridColumn10.MinWidth = 120;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.Width = 120;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
+ this.gridColumn11.FieldName = "itemModel";
+ this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.Width = 120;
//
// gridColumn7
//
@@ -1857,46 +1896,6 @@
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 0;
this.gridColumn7.Width = 200;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鐗╂枡ID";
- this.gridColumn8.FieldName = "id";
- this.gridColumn8.MinWidth = 80;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
- this.gridColumn8.Width = 80;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "鐗╂枡缂栫爜";
- this.gridColumn9.FieldName = "itemNo";
- this.gridColumn9.MinWidth = 100;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 2;
- this.gridColumn9.Width = 100;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 120;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 3;
- this.gridColumn10.Width = 120;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
- this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 120;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 120;
//
// gvMx1qd002
//
@@ -2033,10 +2032,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -2060,9 +2059,9 @@
// rptBl
//
this.rptBl.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
@@ -2082,7 +2081,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1330, 323);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1330, 319);
this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2091,7 +2090,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1330, 323);
+ this.gcMx2.Size = new System.Drawing.Size(1330, 319);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2268,6 +2267,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn28.FieldName = "qtlx";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 4;
+ this.gridColumn28.Width = 94;
+ //
// Frm_MesItemQtrk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2398,7 +2407,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt015;
@@ -2550,5 +2559,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 95accb1..1ed4291 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -1,18 +1,18 @@
+using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using Gs.DevApp.DevFrm.Rpt;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemQtrk : DevExpress.XtraEditors.XtraForm
{
@@ -704,6 +704,9 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+
}
/// <summary>
/// 绉诲嚭鏄庣粏
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 7b70727..aeb42ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+锘縩amespace Gs.DevApp.DevFrm.Rk
{
partial class Frm_MesItemQtrkDj
{
@@ -68,7 +66,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -139,6 +137,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -299,7 +298,8 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn13});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -367,7 +367,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 3;
+ this.gv_depotsId.VisibleIndex = 4;
this.gv_depotsId.Width = 89;
//
// bandedGridColumn1
@@ -377,7 +377,7 @@
this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 4;
+ this.bandedGridColumn1.VisibleIndex = 5;
this.bandedGridColumn1.Width = 94;
//
// gv_createBy
@@ -390,7 +390,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 66;
//
// gv_createDate
@@ -403,7 +403,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
+ this.gv_createDate.VisibleIndex = 7;
this.gv_createDate.Width = 146;
//
// gv_lastupdateBy
@@ -416,7 +416,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 7;
+ this.gv_lastupdateBy.VisibleIndex = 8;
this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
@@ -429,7 +429,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 8;
+ this.gv_lastupdateDate.VisibleIndex = 9;
this.gv_lastupdateDate.Width = 94;
//
// gv_remark
@@ -442,7 +442,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 = 10;
this.gv_remark.Width = 119;
//
// bandedGridColumn4
@@ -452,7 +452,7 @@
this.bandedGridColumn4.MinWidth = 25;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 10;
+ this.bandedGridColumn4.VisibleIndex = 11;
this.bandedGridColumn4.Width = 94;
//
// gv_checkUser
@@ -465,7 +465,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 11;
+ this.gv_checkUser.VisibleIndex = 12;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -478,7 +478,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 12;
+ this.gv_checkDate.VisibleIndex = 13;
this.gv_checkDate.Width = 94;
//
// bandedGridColumn3
@@ -488,7 +488,7 @@
this.bandedGridColumn3.MinWidth = 25;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 13;
+ this.bandedGridColumn3.VisibleIndex = 14;
this.bandedGridColumn3.Width = 94;
//
// bandedGridColumn5
@@ -498,7 +498,7 @@
this.bandedGridColumn5.MinWidth = 25;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.VisibleIndex = 14;
+ this.bandedGridColumn5.VisibleIndex = 15;
this.bandedGridColumn5.Width = 94;
//
// gv_guid
@@ -519,7 +519,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 15;
+ this.gridColumn7.VisibleIndex = 16;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -529,7 +529,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 16;
+ this.gridColumn8.VisibleIndex = 17;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -539,7 +539,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 18;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -549,7 +549,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 18;
+ this.gridColumn10.VisibleIndex = 19;
this.gridColumn10.Width = 94;
//
// pageBar1
@@ -1366,6 +1366,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn13.FieldName = "qtlx";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 94;
+ //
// Frm_MesItemQtrkDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1472,7 +1482,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -1544,5 +1554,6 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 10924da..20792ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesItemTbl
{
@@ -88,7 +85,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2402,7 +2399,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl010;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl011;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl012;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookOrg txt_tbl023;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index ef838e6..4cdb1bf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,16 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemTbl : DevExpress.XtraEditors.XtraForm
{
@@ -32,6 +34,8 @@
toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
+ toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -195,7 +199,7 @@
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
-
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -268,6 +272,25 @@
{
_toolCk(3);
}
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(4);
+ }
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(5);
+ }
+
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -445,7 +468,13 @@
}
if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
+ txt_tbl005.Focus();
+ return;
+ }
+ if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
txt_tbl005.Focus();
return;
}
@@ -713,6 +742,12 @@
case 3:
strMsg = "鍙嶆壒鍑�";
break;
+ case 4:
+ strMsg = "鍝佽川瀹℃牳";
+ break;
+ case 5:
+ strMsg = "鍝佽川鍙嶅鏍�";
+ break;
}
;
toolBarMenu1.guidKey = "";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
index 85db0b6..41b3f90 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rk
+锘縩amespace Gs.DevApp.DevFrm.Rk
{
partial class Frm_MesItemTbl_RK
{
@@ -67,7 +65,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -1441,7 +1439,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
index b74c10a..7905e80 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.Rk
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectItemTbl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
index 6d24c9e..6f7613b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
@@ -1,11 +1,12 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Rk
+namespace Gs.DevApp.UserControl
{
public partial class SelectItemTbl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
index 4c10770..090607f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -1,5 +1,4 @@
锘縰sing Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
namespace Gs.DevApp.DevFrm.RkQC
{
@@ -55,7 +54,7 @@
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -879,7 +878,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
index 81eee80..f92475f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.RkQC
+锘縩amespace Gs.DevApp.DevFrm.RkQC
{
partial class Frm_CqfaItems
{
@@ -41,7 +39,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
this.SuspendLayout();
@@ -213,7 +211,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index 50644e2..bd6f2f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.RkQC
+锘縩amespace Gs.DevApp.DevFrm.RkQC
{
partial class Frm_Cqsq
{
@@ -59,7 +57,7 @@
this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1199,7 +1197,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
index 757faeb..ee46cd9 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.RkQC
+锘縩amespace Gs.DevApp.DevFrm.RkQC
{
partial class RkDetect01
{
@@ -91,7 +89,7 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2687,7 +2685,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
index e1924ed..5336f0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
partial class BTDetails
{
@@ -66,7 +63,7 @@
this.fromDepotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.invDepotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -927,7 +924,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn billNo;
private DevExpress.XtraGrid.Columns.GridColumn itemBarcode;
private DevExpress.XtraGrid.Columns.GridColumn itemId;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
index 7257796..8911700 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
@@ -1,14 +1,15 @@
+using DevExpress.Utils.DirectXPaint;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
public partial class BTDetails : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
index 93bdf67..1f0acda 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
partial class CKTmkc
{
@@ -61,7 +58,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -902,7 +899,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
index 90f3627..9650a14 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -1,14 +1,14 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
public partial class CKTmkc : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
index 9ba8c82..4ad4a31 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.Rpt
{
partial class CPMX
@@ -51,7 +48,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -499,7 +496,7 @@
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs
index 91a0f33..6627720 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+锘縩amespace Gs.DevApp.DevFrm.Rpt
{
partial class CkKuCun
{
@@ -50,7 +48,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -372,7 +370,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CkYtmx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CkYtmx.Designer.cs
index bbeec1c..6fb7bd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CkYtmx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CkYtmx.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+锘縩amespace Gs.DevApp.DevFrm.Rpt
{
partial class CkYtmx
{
@@ -48,7 +46,7 @@
this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -343,7 +341,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
index 475a9f7..4b2d809 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+锘縩amespace Gs.DevApp.DevFrm.Rpt
{
partial class Ckcgmx
{
@@ -51,7 +49,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -567,7 +565,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gridView1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_guid;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_itemBarcode;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
index af5128a..db5aeb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
@@ -1,7 +1,4 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.Rpt
{
partial class ItemQL
@@ -49,7 +46,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -156,7 +153,6 @@
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// gridColumn1
@@ -322,7 +318,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn itemName;
private DevExpress.XtraGrid.Columns.GridColumn itemModel;
private DevExpress.XtraGrid.Columns.GridColumn itemNo1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
index 7808abd..53a09ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
@@ -1,10 +1,13 @@
+using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
+using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -20,6 +23,7 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnOutClick += btnOutput_Click;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
@@ -129,5 +133,52 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ private void btnOutput_Click(object sender, EventArgs e)
+ {
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and c.FSubsidiary in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ string _folder = folderBrowserDialog.SelectedPath;
+ var _params = new
+ {
+ inQueryWhere = _sbSqlWhere.ToString()
+ };
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_ItemQL", "", "", "", _params);
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ string _file = _rtn.rtnData.fileUrl.ToString();
+ string _folderName = _folder + "\\" + _file.Replace("down/", "");
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+ }
+ else
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
index 75d599c..64f146a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
partial class WOTraceCodes
{
@@ -51,7 +48,7 @@
this.daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.processNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.nextProcessNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -160,7 +157,6 @@
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// AboutGuid
@@ -169,6 +165,8 @@
this.AboutGuid.FieldName = "AboutGuid";
this.AboutGuid.MinWidth = 30;
this.AboutGuid.Name = "AboutGuid";
+ this.AboutGuid.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Max, "AboutGuid", "MAX={0}")});
this.AboutGuid.Tag = "AboutGuid";
this.AboutGuid.Width = 112;
//
@@ -197,6 +195,8 @@
this.name.MinWidth = 30;
this.name.Name = "name";
this.name.Tag = "name";
+ this.name.Visible = true;
+ this.name.VisibleIndex = 8;
this.name.Width = 112;
//
// fNumber
@@ -216,7 +216,7 @@
this.barCode.Name = "barCode";
this.barCode.Tag = "barCode";
this.barCode.Visible = true;
- this.barCode.VisibleIndex = 5;
+ this.barCode.VisibleIndex = 0;
this.barCode.Width = 112;
//
// daa001
@@ -227,7 +227,7 @@
this.daa001.Name = "daa001";
this.daa001.Tag = "daa001";
this.daa001.Visible = true;
- this.daa001.VisibleIndex = 6;
+ this.daa001.VisibleIndex = 1;
this.daa001.Width = 112;
//
// lineNo1
@@ -238,7 +238,7 @@
this.lineNo1.Name = "lineNo1";
this.lineNo1.Tag = "lineNo1";
this.lineNo1.Visible = true;
- this.lineNo1.VisibleIndex = 7;
+ this.lineNo1.VisibleIndex = 2;
this.lineNo1.Width = 112;
//
// daa029
@@ -249,7 +249,7 @@
this.daa029.Name = "daa029";
this.daa029.Tag = "daa029";
this.daa029.Visible = true;
- this.daa029.VisibleIndex = 8;
+ this.daa029.VisibleIndex = 3;
this.daa029.Width = 112;
//
// daa003
@@ -260,7 +260,7 @@
this.daa003.Name = "daa003";
this.daa003.Tag = "daa003";
this.daa003.Visible = true;
- this.daa003.VisibleIndex = 9;
+ this.daa003.VisibleIndex = 4;
this.daa003.Width = 112;
//
// daa004
@@ -271,7 +271,7 @@
this.daa004.Name = "daa004";
this.daa004.Tag = "daa004";
this.daa004.Visible = true;
- this.daa004.VisibleIndex = 10;
+ this.daa004.VisibleIndex = 5;
this.daa004.Width = 112;
//
// processNo
@@ -282,7 +282,7 @@
this.processNo.Name = "processNo";
this.processNo.Tag = "processNo";
this.processNo.Visible = true;
- this.processNo.VisibleIndex = 11;
+ this.processNo.VisibleIndex = 6;
this.processNo.Width = 112;
//
// nextProcessNo
@@ -293,7 +293,7 @@
this.nextProcessNo.Name = "nextProcessNo";
this.nextProcessNo.Tag = "nextProcessNo";
this.nextProcessNo.Visible = true;
- this.nextProcessNo.VisibleIndex = 12;
+ this.nextProcessNo.VisibleIndex = 7;
this.nextProcessNo.Width = 112;
//
// pageBar1
@@ -339,7 +339,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn barCode;
private DevExpress.XtraGrid.Columns.GridColumn daa001;
private DevExpress.XtraGrid.Columns.GridColumn lineNo1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
index c4188fb..172743f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
@@ -1,14 +1,14 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Rpt
+namespace Gs.DevApp.DevFrm
{
public partial class WOTraceCodes : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 03c43fb..1cdb71f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
partial class Frm_SalesDeliver
{
@@ -72,10 +69,11 @@
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
@@ -98,43 +96,30 @@
this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
- this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fMustQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -206,32 +191,31 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -594,6 +578,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_chkStatus);
this.layoutMx1.Controls.Add(this.txt_id);
@@ -617,7 +602,8 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem16});
+ this.layoutControlItem16,
+ this.layoutControlItem12});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
@@ -625,6 +611,16 @@
this.layoutMx1.Size = new System.Drawing.Size(1360, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.StyleController = this.layoutMx1;
+ this.btnSelect.TabIndex = 444;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// lbGuid
//
@@ -636,10 +632,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(682, 73);
+ this.txt_chkStatus.Location = new System.Drawing.Point(671, 74);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(326, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 376;
this.txt_chkStatus.Tag = "readonly";
@@ -659,7 +655,7 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(223, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -667,23 +663,23 @@
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 42);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 43);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(223, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 362;
//
// txt_fApproverID
//
- this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
+ this.txt_fApproverID.Location = new System.Drawing.Point(773, 12);
this.txt_fApproverID.Name = "txt_fApproverID";
this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
+ this.txt_fApproverID.Size = new System.Drawing.Size(224, 24);
this.txt_fApproverID.StyleController = this.layoutMx1;
this.txt_fApproverID.TabIndex = 222;
this.txt_fApproverID.Tag = "readonly";
@@ -691,94 +687,94 @@
// txt_salesId
//
this.txt_salesId.IsReadly = false;
- this.txt_salesId.Location = new System.Drawing.Point(114, 73);
+ this.txt_salesId.Location = new System.Drawing.Point(114, 74);
this.txt_salesId.Name = "txt_salesId";
- this.txt_salesId.Size = new System.Drawing.Size(229, 24);
+ this.txt_salesId.Size = new System.Drawing.Size(223, 24);
this.txt_salesId.TabIndex = 367;
//
// txt_fSaleOrgIdTxt
//
- this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
+ this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(443, 12);
this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(224, 24);
this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
this.txt_fSaleOrgIdTxt.TabIndex = 365;
this.txt_fSaleOrgIdTxt.Tag = "readonly";
//
// txt_fCreatorId
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(784, 104);
+ this.txt_fCreatorId.Location = new System.Drawing.Point(1103, 105);
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
+ this.txt_fCreatorId.Size = new System.Drawing.Size(224, 24);
this.txt_fCreatorId.StyleController = this.layoutMx1;
this.txt_fCreatorId.TabIndex = 219;
this.txt_fCreatorId.Tag = "readonly";
//
// txt_fApproveDate
//
- this.txt_fApproveDate.Location = new System.Drawing.Point(784, 42);
+ this.txt_fApproveDate.Location = new System.Drawing.Point(773, 43);
this.txt_fApproveDate.Name = "txt_fApproveDate";
this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_fApproveDate.Size = new System.Drawing.Size(224, 24);
this.txt_fApproveDate.StyleController = this.layoutMx1;
this.txt_fApproveDate.TabIndex = 228;
this.txt_fApproveDate.Tag = "readonly";
//
// txt_fNote
//
- this.txt_fNote.Location = new System.Drawing.Point(114, 104);
+ this.txt_fNote.Location = new System.Drawing.Point(114, 105);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(564, 24);
+ this.txt_fNote.Size = new System.Drawing.Size(223, 24);
this.txt_fNote.StyleController = this.layoutMx1;
this.txt_fNote.TabIndex = 243;
//
// txt_fSalesManIDTxt
//
- this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 135);
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(773, 105);
this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(224, 24);
this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
this.txt_fSalesManIDTxt.TabIndex = 231;
this.txt_fSalesManIDTxt.Tag = "readonly";
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(784, 135);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(1103, 136);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(224, 24);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 226;
this.txt_fCreateDate.Tag = "readonly";
//
// txt_fCustomerIDTxt
//
- this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 42);
+ this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(443, 43);
this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(224, 24);
this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
this.txt_fCustomerIDTxt.TabIndex = 368;
this.txt_fCustomerIDTxt.Tag = "readonly";
//
// txt_shf
//
- this.txt_shf.Location = new System.Drawing.Point(449, 73);
+ this.txt_shf.Location = new System.Drawing.Point(443, 74);
this.txt_shf.Name = "txt_shf";
- this.txt_shf.Size = new System.Drawing.Size(229, 24);
+ this.txt_shf.Size = new System.Drawing.Size(224, 24);
this.txt_shf.StyleController = this.layoutMx1;
this.txt_shf.TabIndex = 373;
this.txt_shf.Tag = "readonly";
//
// txt_shName
//
- this.txt_shName.Location = new System.Drawing.Point(449, 135);
+ this.txt_shName.Location = new System.Drawing.Point(443, 105);
this.txt_shName.Name = "txt_shName";
- this.txt_shName.Size = new System.Drawing.Size(229, 24);
+ this.txt_shName.Size = new System.Drawing.Size(224, 24);
this.txt_shName.StyleController = this.layoutMx1;
this.txt_shName.TabIndex = 374;
this.txt_shName.Tag = "readonly";
@@ -795,31 +791,31 @@
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
+ this.txt_qt031.Location = new System.Drawing.Point(1103, 12);
this.txt_qt031.Name = "txt_qt031";
this.txt_qt031.Properties.ReadOnly = true;
- this.txt_qt031.Size = new System.Drawing.Size(229, 24);
+ this.txt_qt031.Size = new System.Drawing.Size(224, 24);
this.txt_qt031.StyleController = this.layoutMx1;
this.txt_qt031.TabIndex = 378;
this.txt_qt031.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(1119, 42);
+ this.txt_qt030.Location = new System.Drawing.Point(1103, 43);
this.txt_qt030.Name = "txt_qt030";
this.txt_qt030.Properties.ReadOnly = true;
- this.txt_qt030.Size = new System.Drawing.Size(229, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(224, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 379;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(1017, 73);
+ this.txt_qt029.Location = new System.Drawing.Point(1001, 74);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
this.txt_qt029.Properties.ReadOnly = true;
- this.txt_qt029.Size = new System.Drawing.Size(331, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(326, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 380;
this.txt_qt029.Tag = "readonly";
@@ -849,29 +845,43 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_wjStatus;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.Location = new System.Drawing.Point(1005, 92);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem2,
this.layoutControlItem13,
this.layoutControlItem5,
this.layoutControlItem14,
this.layoutControlItem8,
this.layoutControlItem4,
- this.layoutControlItem3,
- this.layoutControlItem12,
- this.layoutControlItem9,
- this.layoutControlItem17,
this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem15,
this.layoutControlItem18,
- this.layoutControlItem6,
this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem20});
+ this.layoutControlItem17,
+ this.layoutControlItem9,
+ this.layoutControlItem3,
+ this.layoutControlItem2,
+ this.layoutControlItem21});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -903,30 +913,19 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 174);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_billNo;
- this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(335, 30);
- this.layoutControlItem2.Text = "鐢宠缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 30);
+ this.layoutControlItem13.Location = new System.Drawing.Point(329, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -935,10 +934,10 @@
this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(329, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(335, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem5.Text = "閿�鍞粍缁�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -947,11 +946,11 @@
this.layoutControlItem14.Control = this.txt_shf;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(335, 61);
+ this.layoutControlItem14.Location = new System.Drawing.Point(329, 62);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem14.Text = "鏀惰揣鏂�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
@@ -960,11 +959,10 @@
this.layoutControlItem8.Control = this.txt_fNote;
this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞";
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(670, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(329, 31);
this.layoutControlItem8.Text = "鐢宠澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
@@ -973,73 +971,22 @@
this.layoutControlItem4.Control = this.txt_salesId;
this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem4.CustomizationFormText = "閿�鍞鍗�";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 61);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(329, 31);
this.layoutControlItem4.Text = "閿�鍞鍗�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fBillTypeID;
- this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_wjStatus;
- this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.Location = new System.Drawing.Point(1005, 92);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
- this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 123);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem9.Text = "閿�鍞汉鍛�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_shName;
- this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.Location = new System.Drawing.Point(335, 123);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fApproverID;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
- this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(659, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(335, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1048,22 +995,22 @@
this.layoutControlItem11.Control = this.txt_fApproveDate;
this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
- this.layoutControlItem11.Location = new System.Drawing.Point(670, 30);
+ this.layoutControlItem11.Location = new System.Drawing.Point(659, 31);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_chkStatus;
- this.layoutControlItem15.Location = new System.Drawing.Point(670, 61);
+ this.layoutControlItem15.Location = new System.Drawing.Point(659, 62);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -1071,61 +1018,124 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt031;
- this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(989, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(335, 30);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_qt030;
+ this.layoutControlItem19.Location = new System.Drawing.Point(989, 31);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_qt029;
+ this.layoutControlItem20.Location = new System.Drawing.Point(989, 62);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem20.TextVisible = false;
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fCreatorId;
this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
- this.layoutControlItem6.Location = new System.Drawing.Point(670, 92);
+ this.layoutControlItem6.Location = new System.Drawing.Point(989, 93);
this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_qt030;
- this.layoutControlItem19.Location = new System.Drawing.Point(1005, 30);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fCreateDate;
this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.Location = new System.Drawing.Point(670, 123);
+ this.layoutControlItem7.Location = new System.Drawing.Point(989, 124);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem20
+ // layoutControlItem17
//
- this.layoutControlItem20.Control = this.txt_qt029;
- this.layoutControlItem20.Location = new System.Drawing.Point(1005, 61);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem20.TextVisible = false;
+ this.layoutControlItem17.Control = this.txt_shName;
+ this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem17.Location = new System.Drawing.Point(329, 93);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
+ this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
+ this.layoutControlItem9.Location = new System.Drawing.Point(659, 93);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem9.Text = "閿�鍞汉鍛�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_fBillTypeID;
+ this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_billNo;
+ this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem2.Text = "鐢宠缂栧彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.btnSelect;
+ this.layoutControlItem21.CustomizationFormText = "閫夋嫨鐗╂枡";
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem21.TextVisible = false;
//
// tabMx
//
@@ -1152,7 +1162,6 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1,
this.repositoryItemDateEdit1});
this.gcMx1.Size = new System.Drawing.Size(1358, 352);
@@ -1163,7 +1172,6 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
this.gvMx1fMustQty,
this.gridColumn11,
this.gvMx1fEntrynote,
@@ -1194,150 +1202,9 @@
this.gridColumn37});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn1.Caption = "璇烽�夋嫨";
- this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "edit";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
- //
- // repositoryItemSearchLookUpEdit1
- //
- this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
- this.repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit;
- this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
- this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
- this.repositoryItemSearchLookUpEdit1.PopupFormMinSize = new System.Drawing.Size(900, 0);
- this.repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(900, 0);
- this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
- this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
- //
- // gridView2
- //
- this.gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView2.ColumnPanelRowHeight = 50;
- this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn10,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn7,
- this.gridColumn8,
- this.gridColumn9,
- this.gridColumn6,
- this.gridColumn30,
- this.gridColumn31,
- this.gridColumn32});
- this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
- this.gridView2.Name = "gridView2";
- this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
- this.gridView2.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "閿�鍞崟鍙�";
- this.gridColumn10.FieldName = "billNo";
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 0;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "閿�鍞崟浣�";
- this.gridColumn4.FieldName = "xxdw";
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 50;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "閿�鍞暟閲�";
- this.gridColumn5.FieldName = "qty";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 50;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "渚涘簲缁勭粐";
- this.gridColumn7.FieldName = "gyOrg";
- this.gridColumn7.Name = "gridColumn7";
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "搴撳瓨缁勭粐";
- this.gridColumn8.FieldName = "kcOrg";
- this.gridColumn8.Name = "gridColumn8";
- //
- // gridColumn9
- //
- this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
- this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn9.Caption = "鏈彂璐ф暟閲�";
- this.gridColumn9.FieldName = "syQty";
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 50;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "閿�鍞粍缁�";
- this.gridColumn6.FieldName = "salesOrgName";
- this.gridColumn6.Name = "gridColumn6";
- //
- // gridColumn30
- //
- this.gridColumn30.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn30.FieldName = "itemName";
- this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 5;
- //
- // gridColumn31
- //
- this.gridColumn31.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn31.FieldName = "itemModel";
- this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 6;
- //
- // gridColumn32
- //
- this.gridColumn32.Caption = "璁′环鍗曚綅";
- this.gridColumn32.FieldName = "jjdw";
- this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 7;
- this.gridColumn32.Width = 50;
//
// gvMx1fMustQty
//
@@ -1352,7 +1219,7 @@
this.gvMx1fMustQty.Name = "gvMx1fMustQty";
this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
this.gvMx1fMustQty.Visible = true;
- this.gvMx1fMustQty.VisibleIndex = 3;
+ this.gvMx1fMustQty.VisibleIndex = 2;
this.gvMx1fMustQty.Width = 94;
//
// gridColumn11
@@ -1368,7 +1235,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
+ this.gridColumn11.VisibleIndex = 3;
this.gridColumn11.Width = 94;
//
// repositoryItemDateEdit1
@@ -1393,7 +1260,7 @@
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
- this.gvMx1fEntrynote.VisibleIndex = 5;
+ this.gvMx1fEntrynote.VisibleIndex = 4;
this.gvMx1fEntrynote.Width = 94;
//
// gvMx1fRealQty
@@ -1405,7 +1272,7 @@
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
- this.gvMx1fRealQty.VisibleIndex = 6;
+ this.gvMx1fRealQty.VisibleIndex = 5;
this.gvMx1fRealQty.Width = 94;
//
// gridColumn12
@@ -1415,7 +1282,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 7;
+ this.gridColumn12.VisibleIndex = 6;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1425,7 +1292,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 1;
+ this.gridColumn13.VisibleIndex = 0;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -1435,7 +1302,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 2;
+ this.gridColumn14.VisibleIndex = 1;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -1445,7 +1312,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 8;
+ this.gridColumn15.VisibleIndex = 15;
this.gridColumn15.Width = 94;
//
// gridColumn16
@@ -1455,7 +1322,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 9;
+ this.gridColumn16.VisibleIndex = 7;
this.gridColumn16.Width = 94;
//
// gridColumn17
@@ -1465,7 +1332,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 10;
+ this.gridColumn17.VisibleIndex = 8;
this.gridColumn17.Width = 94;
//
// gridColumn18
@@ -1483,7 +1350,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 11;
+ this.gridColumn19.VisibleIndex = 9;
this.gridColumn19.Width = 94;
//
// gridColumn20
@@ -1539,7 +1406,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 15;
+ this.gridColumn25.VisibleIndex = 10;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -1549,7 +1416,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 16;
+ this.gridColumn26.VisibleIndex = 11;
this.gridColumn26.Width = 94;
//
// gridColumn27
@@ -1623,7 +1490,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 17;
+ this.gvMxDel.VisibleIndex = 16;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1705,32 +1572,31 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
@@ -1758,7 +1624,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fNote;
private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
@@ -1772,20 +1638,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fMustQty;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
@@ -1830,13 +1682,11 @@
private DevExpress.XtraEditors.TextEdit txt_shName;
private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.Utils.ToolTipController tips;
@@ -1845,19 +1695,23 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraEditors.TextEdit txt_qt031;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraEditors.TextEdit txt_qt030;
private DevExpress.XtraEditors.CheckEdit txt_qt029;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index e43287d..2e9d92d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -1,15 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index e432dfb..8418035 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+锘縩amespace Gs.DevApp.DevFrm.Ck
{
partial class Frm_SalesDeliverDj
{
@@ -65,7 +63,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1441,7 +1439,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
index 668cefb..9c2f7de 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm.Ck
{
public partial class Frm_SalesDeliverDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 9883431..cceceda 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
partial class Frm_SalesOrder
{
@@ -92,7 +89,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2640,7 +2637,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1eHid;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index c924965..f76faa9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_SalesOrder : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 3d6b9ff..e029ed2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
partial class Frm_SalesReturnNotice
{
@@ -85,7 +82,7 @@
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2308,7 +2305,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 3df7802..2ce2ed3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,16 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_SalesReturnNotice : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index e61d04c..78807c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+锘縩amespace Gs.DevApp.DevFrm.Sales
{
partial class Frm_SalesReturnNoticeDj
{
@@ -64,7 +62,7 @@
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1416,7 +1414,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 345811d..749f878 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -1,6 +1,4 @@
锘�
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.Sys
{
partial class DocNoRule
@@ -50,7 +48,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_resetZero = new DevExpress.XtraEditors.CheckEdit();
@@ -803,7 +801,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
index 58ed8ed..bb0c49b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -38,9 +38,11 @@
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
this.lb_sctlbfb = new DevExpress.XtraEditors.LabelControl();
this.lb_cgthsqcgy = new DevExpress.XtraEditors.LabelControl();
this.lb_qtckdcgy = new DevExpress.XtraEditors.LabelControl();
@@ -59,10 +61,10 @@
this.txt_FSalesManId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -73,9 +75,12 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_qtRk = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_qtRk = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
this.splitContainerControl1.Panel1.SuspendLayout();
@@ -95,10 +100,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -109,8 +114,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -144,6 +152,7 @@
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.lb_qtRk);
this.layoutControl1.Controls.Add(this.lb_FSalesManId);
this.layoutControl1.Controls.Add(this.lb_sctlbfb);
this.layoutControl1.Controls.Add(this.lb_cgthsqcgy);
@@ -161,16 +170,18 @@
this.layoutControl1.Controls.Add(this.txt_cgthsqcgy);
this.layoutControl1.Controls.Add(this.txt_sctlbfb);
this.layoutControl1.Controls.Add(this.txt_FSalesManId);
+ this.layoutControl1.Controls.Add(this.txt_qtRk);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem13,
this.layoutControlItem15,
this.layoutControlItem17,
- this.layoutControlItem11});
+ this.layoutControlItem9,
+ this.layoutControlItem11,
+ this.layoutControlItem19});
this.layoutControl1.Location = new System.Drawing.Point(2, 28);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 500);
@@ -178,6 +189,15 @@
this.layoutControl1.Size = new System.Drawing.Size(549, 329);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // lb_FSalesManId
+ //
+ this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
+ this.lb_FSalesManId.Name = "lb_FSalesManId";
+ this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
+ this.lb_FSalesManId.StyleController = this.layoutControl1;
+ this.lb_FSalesManId.TabIndex = 21;
+ this.lb_FSalesManId.Text = "FSalesManId";
//
// lb_sctlbfb
//
@@ -199,7 +219,7 @@
//
// lb_qtckdcgy
//
- this.lb_qtckdcgy.Location = new System.Drawing.Point(416, 187);
+ this.lb_qtckdcgy.Location = new System.Drawing.Point(12, 135);
this.lb_qtckdcgy.Name = "lb_qtckdcgy";
this.lb_qtckdcgy.Size = new System.Drawing.Size(100, 18);
this.lb_qtckdcgy.StyleController = this.layoutControl1;
@@ -217,7 +237,7 @@
//
// lb_qtkg
//
- this.lb_qtkg.Location = new System.Drawing.Point(433, 86);
+ this.lb_qtkg.Location = new System.Drawing.Point(12, 73);
this.lb_qtkg.Name = "lb_qtkg";
this.lb_qtkg.Size = new System.Drawing.Size(28, 18);
this.lb_qtkg.StyleController = this.layoutControl1;
@@ -244,24 +264,24 @@
//
// txt_qtrkdysy
//
- this.txt_qtrkdysy.Location = new System.Drawing.Point(174, 12);
+ this.txt_qtrkdysy.Location = new System.Drawing.Point(212, 11);
this.txt_qtrkdysy.Name = "txt_qtrkdysy";
- this.txt_qtrkdysy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtrkdysy.Size = new System.Drawing.Size(304, 24);
this.txt_qtrkdysy.StyleController = this.layoutControl1;
this.txt_qtrkdysy.TabIndex = 4;
//
// txt_qtrkdcgy
//
- this.txt_qtrkdcgy.Location = new System.Drawing.Point(174, 46);
+ this.txt_qtrkdcgy.Location = new System.Drawing.Point(212, 42);
this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
- this.txt_qtrkdcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtrkdcgy.Size = new System.Drawing.Size(304, 24);
this.txt_qtrkdcgy.StyleController = this.layoutControl1;
this.txt_qtrkdcgy.TabIndex = 5;
//
// btnSave
//
this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
- this.btnSave.Location = new System.Drawing.Point(12, 284);
+ this.btnSave.Location = new System.Drawing.Point(12, 290);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(96, 27);
this.btnSave.StyleController = this.layoutControl1;
@@ -270,50 +290,50 @@
//
// txt_qtkg
//
- this.txt_qtkg.Location = new System.Drawing.Point(12, 80);
+ this.txt_qtkg.Location = new System.Drawing.Point(12, 73);
this.txt_qtkg.Name = "txt_qtkg";
this.txt_qtkg.Properties.Caption = "榻愬寮�宸�";
- this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
+ this.txt_qtkg.Size = new System.Drawing.Size(504, 24);
this.txt_qtkg.StyleController = this.layoutControl1;
this.txt_qtkg.TabIndex = 8;
//
// txt_qtckdllr
//
- this.txt_qtckdllr.Location = new System.Drawing.Point(174, 114);
+ this.txt_qtckdllr.Location = new System.Drawing.Point(212, 104);
this.txt_qtckdllr.Name = "txt_qtckdllr";
- this.txt_qtckdllr.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtckdllr.Size = new System.Drawing.Size(304, 24);
this.txt_qtckdllr.StyleController = this.layoutControl1;
this.txt_qtckdllr.TabIndex = 9;
//
// txt_qtckdcgy
//
- this.txt_qtckdcgy.Location = new System.Drawing.Point(174, 148);
+ this.txt_qtckdcgy.Location = new System.Drawing.Point(212, 135);
this.txt_qtckdcgy.Name = "txt_qtckdcgy";
- this.txt_qtckdcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtckdcgy.Size = new System.Drawing.Size(304, 24);
this.txt_qtckdcgy.StyleController = this.layoutControl1;
this.txt_qtckdcgy.TabIndex = 10;
//
// txt_cgthsqcgy
//
- this.txt_cgthsqcgy.Location = new System.Drawing.Point(174, 182);
+ this.txt_cgthsqcgy.Location = new System.Drawing.Point(212, 166);
this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
- this.txt_cgthsqcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_cgthsqcgy.Size = new System.Drawing.Size(304, 24);
this.txt_cgthsqcgy.StyleController = this.layoutControl1;
this.txt_cgthsqcgy.TabIndex = 16;
//
// txt_sctlbfb
//
- this.txt_sctlbfb.Location = new System.Drawing.Point(174, 216);
+ this.txt_sctlbfb.Location = new System.Drawing.Point(212, 197);
this.txt_sctlbfb.Name = "txt_sctlbfb";
- this.txt_sctlbfb.Size = new System.Drawing.Size(363, 24);
+ this.txt_sctlbfb.Size = new System.Drawing.Size(304, 24);
this.txt_sctlbfb.StyleController = this.layoutControl1;
this.txt_sctlbfb.TabIndex = 18;
//
// txt_FSalesManId
//
- this.txt_FSalesManId.Location = new System.Drawing.Point(174, 250);
+ this.txt_FSalesManId.Location = new System.Drawing.Point(212, 228);
this.txt_FSalesManId.Name = "txt_FSalesManId";
- this.txt_FSalesManId.Size = new System.Drawing.Size(363, 24);
+ this.txt_FSalesManId.Size = new System.Drawing.Size(304, 24);
this.txt_FSalesManId.StyleController = this.layoutControl1;
this.txt_FSalesManId.TabIndex = 20;
//
@@ -339,18 +359,6 @@
this.layoutControlItem8.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳label";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.lb_qtkg;
- this.layoutControlItem9.Location = new System.Drawing.Point(421, 74);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(108, 37);
- this.layoutControlItem9.Text = "榻愬寮�宸abel";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
//
// layoutControlItem10
//
@@ -388,6 +396,19 @@
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lb_FSalesManId;
+ this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
+ this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
+ this.layoutControlItem17.Text = "閿�鍞憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -401,7 +422,8 @@
this.layoutControlItem12,
this.layoutControlItem14,
this.layoutControlItem16,
- this.layoutControlItem4});
+ this.layoutControlItem4,
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -426,6 +448,8 @@
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition9.Height = 100D;
rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -435,8 +459,9 @@
rowDefinition6,
rowDefinition7,
rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(549, 329);
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(528, 330);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -444,27 +469,27 @@
this.layoutControlItem1.Control = this.txt_qtrkdysy;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem1.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem1.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qtrkdcgy;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem2.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem2.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qtkg;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem3.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem3.Text = "榻愬寮�宸�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -472,100 +497,126 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qtckdllr;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 102);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem5.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qtckdcgy;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 136);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem6.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem6.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_cgthsqcgy;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 170);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem12.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem12.Text = "閲囪喘閫�璐х敵璇烽噰璐憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_sctlbfb;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 204);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 186);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem14.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem14.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_FSalesManId;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 238);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 217);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem16.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem16.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem16.Text = "閿�鍞憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.btnSave;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 272);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 279);
this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem4.Size = new System.Drawing.Size(529, 37);
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem4.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Text = "纭畾淇濆瓨";
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem4.TextVisible = false;
//
+ // txt_qtRk
+ //
+ this.txt_qtRk.Location = new System.Drawing.Point(212, 259);
+ this.txt_qtRk.Name = "txt_qtRk";
+ this.txt_qtRk.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtRk.StyleController = this.layoutControl1;
+ this.txt_qtRk.TabIndex = 22;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_qtRk;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 248);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem18.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem18.Text = "榻愬鍏ュ簱(1:寮�鍚� 锛�0锛氬叧闂�)";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(188, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lb_qtkg;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem9.Text = "榻愬寮�宸abel";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
// layoutControlItem11
//
this.layoutControlItem11.Control = this.lb_qtckdcgy;
- this.layoutControlItem11.Location = new System.Drawing.Point(404, 186);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem11.Size = new System.Drawing.Size(104, 31);
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem11.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem11.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳label";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
- // lb_FSalesManId
+ // lb_qtRk
//
- this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
- this.lb_FSalesManId.Name = "lb_FSalesManId";
- this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
- this.lb_FSalesManId.StyleController = this.layoutControl1;
- this.lb_FSalesManId.TabIndex = 21;
- this.lb_FSalesManId.Text = "FSalesManId";
+ this.lb_qtRk.Location = new System.Drawing.Point(12, 259);
+ this.lb_qtRk.Name = "lb_qtRk";
+ this.lb_qtRk.Size = new System.Drawing.Size(30, 18);
+ this.lb_qtRk.StyleController = this.layoutControl1;
+ this.lb_qtRk.TabIndex = 23;
+ this.lb_qtRk.Text = "qtRk";
//
- // layoutControlItem17
+ // layoutControlItem19
//
- this.layoutControlItem17.Control = this.lb_FSalesManId;
- this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
- this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
- this.layoutControlItem17.Text = "閿�鍞憳";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem19.Control = this.lb_qtRk;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 248);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem19.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem19.Text = "榻愬鍏ュ簱label";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem19.TextVisible = false;
//
// Frm_Config
//
@@ -594,10 +645,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -608,8 +659,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
this.ResumeLayout(false);
}
@@ -642,7 +696,6 @@
private DevExpress.XtraEditors.TextEdit txt_sctlbfb;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraEditors.LabelControl lb_sctlbfb;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
@@ -650,9 +703,14 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_FSalesManId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.LabelControl lb_FSalesManId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.LabelControl lb_qtRk;
+ private DevExpress.XtraEditors.TextEdit txt_qtRk;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index a10a4d1..4a55b0b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -51,6 +51,9 @@
//閿�鍞憳
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_FSalesManId.Text.Trim() + "','" + txt_FSalesManId.Text.Trim() + "','" + layoutControlItem16.Text.Trim() + "')");
+ //榻愬鍏ュ簱
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_qtRk.Text.Trim() + "','" + txt_qtRk.Text.Trim() + "','" + layoutControlItem18.Text.Trim() + "')");
var _obj = new
{
sql = sb.ToString(),
@@ -126,12 +129,16 @@
txt_cgthsqcgy.Text = row["parameterValue"].ToString();
continue;
}
-
if (row["remark"].ToString() == layoutControlItem14.Text)
{
txt_sctlbfb.Text = row["parameterValue"].ToString();
continue;
}
+ if (row["remark"].ToString() == layoutControlItem18.Text)
+ {
+ txt_qtRk.Text = row["parameterValue"].ToString();
+ continue;
+ }
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index b320ff3..7197146 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesSysPageview
{
@@ -58,7 +55,7 @@
this.gv_pageStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -555,7 +552,7 @@
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_pageView;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 1920416..9783b84 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -1,12 +1,12 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesSysPageview : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
index 969dcd9..ce3a3e9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm
{
partial class Frm_PrintInfo
{
@@ -49,7 +46,7 @@
this.gv_ip = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_port = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -469,7 +466,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_ip;
private DevExpress.XtraGrid.Columns.GridColumn gv_port;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index f30a4a3..80aa1f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -1,16 +1,17 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.DevFrm.Sys.Mode;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Sys
+
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_PrintInfo : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintInfo.cs
index 66fa2a8..74a79e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintInfo.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.Sys.Mode
+namespace MES.Service.Modes
{
/// <summary>
/// 鎵撳嵃鏈哄熀纭�淇℃伅
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
index 4c8127a..9cb11b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.Sys.Mode
+namespace MES.Service.Modes
{
/// <summary>
/// 鎵撳嵃鏈轰笌鐢ㄦ埛瀵圭収琛�
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index fdc6224..1021b3b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -1,5 +1,5 @@
锘�
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm.User
{
partial class Organization
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index bd0923f..aaf2e0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm.User
{
public partial class Organization : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 914dbe6..48829a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -1,6 +1,4 @@
锘�
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.Sys
{
partial class SysLog
@@ -57,7 +55,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -609,7 +607,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
index c37352d..48f131f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
@@ -1,5 +1,5 @@
锘�
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm.User
{
partial class SysMenu
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index c71a648..f34a688 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -1,10 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Reflection;
-using System.Resources;
-using System.Windows.Forms;
-using DevExpress.Utils;
+锘縰sing DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraTreeList;
@@ -12,8 +6,14 @@
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Resources;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Sys
+namespace Gs.DevApp.DevFrm.User
{
public partial class SysMenu : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 13bad66..07a4eb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -1,6 +1,4 @@
锘�
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.User
{
partial class Role
@@ -57,7 +55,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -500,7 +498,7 @@
private DevExpress.XtraGrid.Columns.GridColumn createDate;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_roleName;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index aa2b52a..ce761ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -1,6 +1,4 @@
锘�
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.User
{
partial class User
@@ -87,7 +85,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -867,7 +865,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookStaff txt_staffId;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
index 1855eab..3c6ead1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+锘縩amespace Gs.DevApp.DevFrm.WOM
{
partial class FrmBackFlash
{
@@ -56,7 +54,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -768,7 +766,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_name;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookDepartment txt_departmentId;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index 9a1b814..de39ac9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesScrkDj
{
@@ -68,7 +65,7 @@
this.bandedGridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1391,7 +1388,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_dptName;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index b4919f6..1158753 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesScrkDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
index 56e30b3..8fb2079 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesWorkProd
{
@@ -73,7 +70,7 @@
this.gv_kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boxQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1184,7 +1181,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_kbQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_boxQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
index 7b8f930..5dcc726 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesWorkProd : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index da314c3..129fa5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+锘縩amespace Gs.DevApp.DevFrm.WOM
{
partial class Frm_WomFanGong
{
@@ -60,7 +58,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1448,7 +1446,7 @@
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 6d1e843..8bddabd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Womcaa
{
@@ -90,7 +87,7 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2171,7 +2168,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_wtOrg;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 55dcd61..00ec288 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -1,15 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Womcaa : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 5136efc..795fa49 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Womdaa
{
@@ -115,7 +112,7 @@
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -4034,7 +4031,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_daa013;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index cc8485c..94b88c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,19 +1,22 @@
+using DevExpress.Data;
+using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.WOM;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Utils;
-using Gs.DevApp.DevFrm.Rpt;
-using Gs.DevApp.DevFrm.Sys;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Womdaa : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index ef1fc3a..46b7b08 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
partial class Frm_Wompba
{
@@ -62,7 +59,7 @@
this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1169,7 +1166,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 440d45e..e07ea37 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
@@ -10,8 +5,13 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_Wompba : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
index bbecff4..166b818 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.WOM
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectWompba
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
index 14d32d9..9dfe504 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
@@ -1,11 +1,12 @@
-锘縰sing System;
+锘�
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.UserControl
{
public partial class SelectWompba : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
index f142829..b7a7101 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.WOM
+锘縩amespace Gs.DevApp.UserControl
{
partial class showZhongTai
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
index 168ada7..dcaa462 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.cs
@@ -1,7 +1,7 @@
-锘縰sing System;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
+using System;
-namespace Gs.DevApp.DevFrm.WOM
+namespace Gs.DevApp.UserControl
{
public partial class showZhongTai : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 95d915c..7703225 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_ProductionOrder
{
@@ -86,7 +83,7 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2355,7 +2352,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_stockowner;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index be2aba9..9acc51a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_ProductionOrder : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
index cb1bbe3..d94bed0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwBl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
index c9652e3..f3db425 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwBl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.Designer.cs
index 894c568..6bdd635 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwBlDj
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
index 414b3b2..ddf149b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwBlDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
index eb588e2..5df2015 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwCl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
index 5e129e5..fb2e77c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwCl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.Designer.cs
index 13a0213..2c61531 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.Designer.cs
@@ -1,5 +1,5 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwClDj
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
index df3d816..5452857 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
@@ -1,4 +1,4 @@
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwClDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index cb788b1..a45f682 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwGd
{
@@ -68,7 +65,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1296,7 +1293,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_wgTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_wgUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 7eb90cf..99b677b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -1,17 +1,18 @@
+using DevExpress.Utils;
+using Gs.DevApp.DevFrm.WW;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Utils;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwGd : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
index 1eb5adc..3810237 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwLlDj
{
@@ -63,7 +60,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1374,7 +1371,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_depotName;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index c54cf2d..6a69e17 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwLlDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index bf39ff6..55a596b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwPc
{
@@ -57,7 +54,7 @@
this.gv_createTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_shBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_shTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -940,7 +937,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_shBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_shTime;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 775e6c5..9a46f4b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwPc : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 3943874..566d47f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwTbl
{
@@ -67,7 +64,7 @@
this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1413,7 +1410,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl011;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl012;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index bf75e05..830a4be 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -1,15 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwTbl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 0a600e6..7224644 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WwTblDj
{
@@ -68,7 +65,7 @@
this.gv_cbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1393,7 +1390,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_cbillNo;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn4;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
index ee20b96..eaba3cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwTblDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
index 01bfbd7..c71d74e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.WW
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectWwPc
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
index 8e6ff93..3a04761 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.UserControl
{
public partial class SelectWwPc : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
index 0ca65ea..59e337d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.WW
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectWwTbl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
index 7a78799..4933702 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.WW
+namespace Gs.DevApp.UserControl
{
public partial class SelectWwTbl : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index 4c5e9bd..d8b30c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+锘縩amespace Gs.DevApp.DevFrm.WW
{
partial class WwBlcl
{
@@ -72,7 +70,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1484,7 +1482,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookOrg txt_orgId;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
index 29d07ce..928e7bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+锘縩amespace Gs.DevApp.DevFrm.WW
{
partial class WwBlclDj
{
@@ -66,7 +64,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1517,7 +1515,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_orgIdTxt;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 36cb63b..a503c6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_ArrivalBarcode
{
@@ -70,7 +67,7 @@
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1792,7 +1789,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 90565d6..db352f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_ArrivalBarcode : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index b889c19..6d0a41f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_InitialBarcode
{
@@ -58,7 +55,7 @@
this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -970,7 +967,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index da12277..1ae2c35 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_InitialBarcode : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index f3acd66..ba1daf0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesDbck
{
@@ -128,7 +125,7 @@
this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2196,7 +2193,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 69a321e..48daa38 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesDbck : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
index d032234..494a424 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+锘縩amespace Gs.DevApp.DevFrm.Warehouse
{
partial class Frm_MesDbckDj
{
@@ -67,7 +65,7 @@
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1674,7 +1672,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 2e35f4e..1d1c252 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesRohIn
{
@@ -82,7 +79,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1884,7 +1881,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 9697bea..84c1b3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rk;
@@ -11,8 +6,13 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesRohIn : XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 192835d..6f81eea 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesShouTui
{
@@ -66,7 +63,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1244,7 +1241,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 65c8b0a..ddbe7d8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesShouTui : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
index 95f698b..c7c825e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesShouTuiDj
{
@@ -64,7 +61,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1282,7 +1279,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_ckName;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
index e38e26d..17794af 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesShouTuiDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index f4dc66f..02ebeb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesShouTuo
{
@@ -67,7 +64,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1476,7 +1473,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt015;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 323e190..4fc75e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -1,16 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Model;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesShouTuo : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
index cb8f235..e9d4e35 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Warehouse
+锘縩amespace Gs.DevApp.DevFrm.Rk
{
partial class Frm_MesShouTuoDj
{
@@ -65,7 +63,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1301,7 +1299,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
index 191df51..79dd744 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.DevFrm.Rk
{
public partial class Frm_MesShouTuoDj : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
index 11b163b..70f4e9d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
@@ -1,7 +1,6 @@
锘�
using System;
-
-namespace Gs.DevApp.DevFrm.Warehouse.Models
+namespace MES.Service.Modes
{
/// <summary>
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
index 04ff1b0..1b1a8af 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
@@ -1,7 +1,7 @@
-锘縰sing System;
+锘�
+using System;
using System.Collections.Generic;
-
-namespace Gs.DevApp.DevFrm.Warehouse.Models
+namespace MES.Service.Modes
{
/// <summary>
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutCDetails.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutCDetails.cs
index d8f7d04..74dbcf8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutCDetails.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutCDetails.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.Warehouse.Models
+namespace MES.Service.Modes
{
/// <summary>
/// 鐗╂枡鍑哄簱鏉＄爜鏄庣粏
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
index 3a507b7..01cdb7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace Gs.DevApp.DevFrm.Warehouse.Models
+namespace MES.Service.Modes
{
/// <summary>
///
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
index df9c5c6..5f972e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.DevFrm.Warehouse
+锘縩amespace Gs.DevApp.UserControl
{
partial class SelectShuoTuiSq
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
index 296abb2..6a7cd2a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -1,15 +1,14 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Warehouse
+namespace Gs.DevApp.UserControl
{
public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
{
-
private readonly string _webServiceName = "MesShouTuiManager/";
private string cusId = "";
private string inOrgId = "";
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index d7061d4..2657df0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -64,7 +64,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -1619,7 +1619,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.SplitContainerControl splitTop1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
index 6cd25bd..d3bcf0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Work
+namespace Gs.DevApp.DevFrm
{
partial class Frm_WorkProcesses
{
@@ -59,7 +56,7 @@
this.gv_lastUpdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -864,7 +861,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateDate;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
index 5c92305..8e1c55f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
@@ -1,14 +1,14 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-namespace Gs.DevApp.DevFrm.Work
+namespace Gs.DevApp.DevFrm
{
public partial class Frm_WorkProcesses : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index f509245..a8aaa07 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Work
+锘縩amespace Gs.DevApp.DevFrm.Work
{
partial class Frm_WorkTechnique
{
@@ -47,7 +45,7 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WorkTechnique));
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -1265,7 +1263,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private System.Windows.Forms.Label lbGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
index f5447ff..f99aea1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Work
+锘縩amespace Gs.DevApp.DevFrm.QC
{
partial class Frm_WorkTechniqueShow
{
@@ -106,7 +104,7 @@
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.panBom = new DevExpress.XtraEditors.PanelControl();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
@@ -1193,7 +1191,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
index b06fa0b..0ce8265 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm.Work
+namespace Gs.DevApp.DevFrm.QC
{
public partial class Frm_WorkTechniqueShow : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 5f90786..2b3abe6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -107,13 +107,7 @@
<Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="FastReport">
- <HintPath>..\..\..\..\FastReport.dll</HintPath>
- </Reference>
- <Reference Include="FastReport.Bars">
- <HintPath>..\..\..\..\FastReport.Bars.dll</HintPath>
- </Reference>
- <Reference Include="FastReport.Editor">
- <HintPath>..\..\..\..\FastReport.Editor.dll</HintPath>
+ <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -841,6 +835,12 @@
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliver.Designer.cs">
<DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.Designer.cs">
+ <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesOrder.cs">
<SubType>Form</SubType>
@@ -1897,6 +1897,9 @@
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliver.resx">
<DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx">
+ <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesOrder.resx">
<DependentUpon>Frm_SalesOrder.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index e4832f6..92a620f 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,26 +1,25 @@
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 1ac05ae..1daefa8 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -28,6 +28,7 @@
using System.Text.RegularExpressions;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
+using UserControls.Data;
using static System.Windows.Forms.Control;
@@ -1936,15 +1937,15 @@
edit.SelectAll();
}
- public static void SetGridLayout(GridView gridView1)
+ public static void SetGridLayout(GridView gridView1,int maxWidth=500)
{
foreach (GridColumn column in gridView1.Columns)
{
- if (column.Width > 500)
- column.Width = 500;
+ if (column.Width > maxWidth)
+ column.Width = maxWidth;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index bc48303..2771cfc 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -179,7 +179,11 @@
itemName = dy.itemName,
itemModel = dy.itemModel,
dwName = dy.kfName,
- itemId = dy.itemId
+ itemId = dy.itemId,
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ depotName = dy.depotName,
+ depotId = dy.depotId,
+ kcQty = dy.kcQty,
});
}
else
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
index 34b78f4..b2b1d9d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -42,6 +42,7 @@
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -55,7 +56,7 @@
this.gcMain.Name = "gcMain";
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.Size = new System.Drawing.Size(751, 489);
this.gcMain.TabIndex = 3;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -68,8 +69,9 @@
this.gv_operationTable,
this.gv_msg,
this.gv_userName,
- this.gv_Btn,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gv_Btn});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -87,7 +89,7 @@
this.gv_operationTime.Tag = "query_OPERATION_TIME";
this.gv_operationTime.Visible = true;
this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 300;
+ this.gv_operationTime.Width = 10;
//
// gv_operationTable
//
@@ -100,7 +102,7 @@
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Visible = true;
this.gv_operationTable.VisibleIndex = 1;
- this.gv_operationTable.Width = 100;
+ this.gv_operationTable.Width = 10;
//
// gv_msg
//
@@ -113,7 +115,7 @@
this.gv_msg.Tag = "query_MSG";
this.gv_msg.Visible = true;
this.gv_msg.VisibleIndex = 2;
- this.gv_msg.Width = 200;
+ this.gv_msg.Width = 10;
//
// gv_userName
//
@@ -124,17 +126,18 @@
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
- this.gv_userName.Width = 250;
+ this.gv_userName.Width = 10;
//
// gv_Btn
//
this.gv_Btn.Caption = "閫夋嫨";
this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 4;
- this.gv_Btn.Width = 94;
+ this.gv_Btn.VisibleIndex = 5;
+ this.gv_Btn.Width = 25;
//
// repositoryItemButtonEdit1
//
@@ -154,14 +157,28 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 25;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn2.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn2.FieldName = "kcQty";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 94;
//
// SelectCk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
+ this.ClientSize = new System.Drawing.Size(751, 489);
this.Controls.Add(this.gcMain);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
@@ -187,5 +204,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index ca8220d..b769a17 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -10,11 +10,19 @@
{
public partial class SelectCk : DevExpress.XtraEditors.XtraForm
{
+ /// <summary>
+ /// 缁勭粐id
+ /// </summary>
string _strGuid = "";
+ /// <summary>
+ /// 鐗╂枡id锛屼负浜嗘煡璇㈠簱瀛�
+ /// </summary>
+ string _itemId = "";
private List<FilterEntity> _filterList = new List<FilterEntity>();
- public SelectCk(string strGuid)
+ public SelectCk(string strGuid, string itemId="")
{
_strGuid = strGuid;
+ _itemId = itemId;
InitializeComponent();
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
@@ -45,14 +53,14 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += (" and org.fid='" + _strGuid + "'");
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", this._itemId, _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
- UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage", json);
+ UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage2", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -97,7 +105,8 @@
{
guid = mxGuid,
name = mxName,
- });
+ kcQty = dr["kcQty"].ToString()
+ });
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
index 6902af0..f957bdc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
@@ -38,13 +38,13 @@
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -87,26 +87,26 @@
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
this.gv_operationTime.FieldName = "xb";
- this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.MinWidth = 50;
this.gv_operationTime.Name = "gv_operationTime";
this.gv_operationTime.OptionsColumn.AllowEdit = false;
this.gv_operationTime.Tag = "query_OPERATION_TIME";
this.gv_operationTime.Visible = true;
this.gv_operationTime.VisibleIndex = 1;
- this.gv_operationTime.Width = 48;
+ this.gv_operationTime.Width = 50;
//
// gv_operationTable
//
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "鐢熶骇杞﹂棿";
this.gv_operationTable.FieldName = "dptnName";
- this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.MinWidth = 50;
this.gv_operationTable.Name = "gv_operationTable";
this.gv_operationTable.OptionsColumn.AllowEdit = false;
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Visible = true;
this.gv_operationTable.VisibleIndex = 2;
- this.gv_operationTable.Width = 48;
+ this.gv_operationTable.Width = 50;
//
// gv_userName
//
@@ -114,13 +114,63 @@
this.gv_userName.Caption = "宸ュ崟鍙�";
this.gv_userName.FieldName = "daa001";
this.gv_userName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_userName.MinWidth = 10;
+ this.gv_userName.MinWidth = 50;
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
this.gv_userName.Visible = true;
this.gv_userName.VisibleIndex = 0;
this.gv_userName.Width = 50;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn1.FieldName = "daa014";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn2.FieldName = "daa021";
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 50;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浜у搧缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 50;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜у搧鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 50;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.Width = 50;
//
// gv_Btn
//
@@ -143,56 +193,6 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鎶曟枡鍗曞彿";
- this.gridColumn1.FieldName = "daa014";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 50;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "浠诲姟鍗曞彿";
- this.gridColumn2.FieldName = "daa021";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 50;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浜у搧缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 50;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浜у搧鍚嶇О";
- this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 50;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
- this.gridColumn5.Width = 50;
//
// SelectDaa
//
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
index 3e97c96..12f0706 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
@@ -46,6 +46,7 @@
gcMain.ForceInitialize();
gridView1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -57,7 +58,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
index 4812307..8a5826b 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -46,7 +46,7 @@
private void getPageList(int curPage)
{
gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "FNumber", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
index d91c8ae..2507632 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -335,7 +335,11 @@
//
// gridColumn12
//
- this.gridColumn12.Caption = "褰撳墠搴撳瓨";
+ this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn12.Caption = "Mes/Erp搴撳瓨";
this.gridColumn12.FieldName = "kcQty";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
index 55ad680..455bc50 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -44,7 +44,7 @@
private void getPageList(int curPage)
{
gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "FNumber", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/Toast.Designer.cs b/DevApp/Gs.DevApp/UserControl/Toast.Designer.cs
index 1b18f69..eaf663f 100644
--- a/DevApp/Gs.DevApp/UserControl/Toast.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/Toast.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.UserControl
+锘縩amespace Gs.DevApp
{
partial class Toast
{
diff --git a/DevApp/Gs.DevApp/UserControl/Toast.cs b/DevApp/Gs.DevApp/UserControl/Toast.cs
index 8f983db..9bc7254 100644
--- a/DevApp/Gs.DevApp/UserControl/Toast.cs
+++ b/DevApp/Gs.DevApp/UserControl/Toast.cs
@@ -3,7 +3,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace Gs.DevApp.UserControl
+namespace Gs.DevApp
{
public partial class Toast : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
index f9d84fc..96ad9b0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.UserControl
+锘縩amespace Gs.DevApp.DevFrm.Work
{
partial class UcDictionarySelect
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index 289aa99..621b517 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -1,14 +1,15 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
-using DevExpress.XtraTreeList;
+锘縰sing DevExpress.XtraTreeList;
using DevExpress.XtraTreeList.Nodes;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
-namespace Gs.DevApp.UserControl
+
+namespace Gs.DevApp.DevFrm.Work
{
public partial class UcDictionarySelect : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcPageBar.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcPageBar.Designer.cs
index 4e189e1..1da8d98 100644
--- a/DevApp/Gs.DevApp/UserControl/UcPageBar.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcPageBar.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Gs.DevApp.UserControl
+锘縩amespace UserControls.Data
{
partial class UcPageBar
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
index 2a7262a..ed09342 100644
--- a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
@@ -1,10 +1,10 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraLayout.Utils;
+using System;
using System.Windows.Forms;
-using DevExpress.XtraLayout.Utils;
-namespace Gs.DevApp.UserControl
+namespace UserControls.Data
{
- public partial class UcPageBar : System.Windows.Forms.UserControl
+ public partial class UcPageBar : UserControl
{
public delegate void
GetPageDataEvents(int curPage, int pageSize); //瀹氫箟濮旀墭
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 2a3bea3..0658423 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -63,6 +63,8 @@
this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnFPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -137,9 +139,11 @@
this.btnGongZi,
this.btnLianBan,
this.btnGx,
- this.btnBaoGao});
+ this.btnBaoGao,
+ this.btnPingZhi,
+ this.btnFPingZhi});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 76;
+ this.barManager1.MaxItemId = 78;
//
// bar2
//
@@ -182,6 +186,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnPingZhi),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnFPingZhi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnAll),
new DevExpress.XtraBars.LinkPersistInfo(this.btnGongZi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLianBan),
@@ -495,6 +501,25 @@
this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnPingZhi
+ //
+ this.btnPingZhi.Caption = "鍝佽川瀹℃牳";
+ this.btnPingZhi.Id = 76;
+ this.btnPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.Image")));
+ this.btnPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.LargeImage")));
+ this.btnPingZhi.Name = "btnPingZhi";
+ this.btnPingZhi.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnFPingZhi
+ //
+ this.btnFPingZhi.Caption = "鍝佽川鍙嶅鏍�";
+ this.btnFPingZhi.Id = 77;
+ this.btnFPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.Image")));
+ this.btnFPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.LargeImage")));
+ this.btnFPingZhi.Name = "btnFPingZhi";
+ this.btnFPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnAll
//
this.btnAll.Caption = "鎵归噺璁剧疆";
@@ -620,7 +645,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 190);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -649,7 +674,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 72);
+ this.Size = new System.Drawing.Size(1543, 190);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -705,5 +730,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnLianBan;
private DevExpress.XtraBars.BarLargeButtonItem btnGx;
private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
+ private DevExpress.XtraBars.BarLargeButtonItem btnPingZhi;
+ private DevExpress.XtraBars.BarLargeButtonItem btnFPingZhi;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b62ed97..b6bd2cc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -65,21 +65,19 @@
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
+ btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
+ btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
lst.Add(item.Caption);
actions = lst;
-
-
-
-
}
+
-
-
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -88,7 +86,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -124,13 +121,11 @@
}
return false;
}
-
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
}
-
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
@@ -341,7 +336,6 @@
frm.ShowDialog();
return;
}
-
MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
@@ -381,7 +375,6 @@
if (btnAllClick != null)
btnAllClick(this, e);
}
-
private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnLianBanClick != null)
@@ -403,6 +396,17 @@
if (btnBaoGaoClick != null)
btnBaoGaoClick(this, e);
}
+ private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPingZhiClick != null)
+ btnFPingZhiClick(this, e);
+ }
+ private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPingZhiClick != null)
+ btnPingZhiClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -442,6 +446,8 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -450,7 +456,6 @@
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -495,6 +500,8 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -1032,6 +1039,17 @@
/// 鐢熸垚鎶ュ憡
/// </summary>
public event EventHandler btnBaoGaoClick;
+
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ public event EventHandler btnPingZhiClick;
+
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ public event EventHandler btnFPingZhiClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1175,7 +1193,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index ef3b42f..a2e9e79 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -311,6 +311,119 @@
AABJRU5ErkJggg==
</value>
</data>
+ <data name="btnPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFN0YWNrZWRCYXIzRDszRDsQhC4B
+ AAACTElEQVQ4T23Sy09TQRQG8PlzfC3cqXtduDICmqhEtInRqIhg0SAFBBHBWIuIQRuBYlFjeEiioWJ5
+ iVQTQI0mSOJGV5QiLX3Q3kfv7eeZU3qh4uLXSe8983XSb0R779cxggde6Qtre5rzGfd7slo90hxc3XO4
+ 1zXLnJ0zY6Kp4yMyQBZ9WOsWmXWAyTKob/sA0fgwwA8V1UBKTRMDSV7TvCb5e/bZmrLBpJS61imIm+3T
+ HCAHfr5/ifHmIozdLsTorQLUtPTgqjtgSaR0i0EBta5JCHkMeRyZ2ntmD8ylbpihLsz/DmBgYYU5vHM4
+ WNqPeFLPSmkwDBPVzgmIWtcUHyeRSqO7eDfCfhtmW/bhrOcb65kJ8mYpmtQQW9MQXdOhU0DVnXGIGuck
+ H0cmu4/ugvvITjwu2mFtynky9J02alhNUADR0yauNY9CXL87gbSRQYwCZLIc4sHcSsNSJCeepekGKpv8
+ EDJFozQeohdhHlBZmKzE/qVgJapwS+UNIxB2SlF1E2F6+WP8RV4L/sbDeNdwCI5mT14byxSQVHSU3fDl
+ B2xuwVwiwU7M/5re0kZeQEXjCBTNoGOpVguLz/dj8dmB/7ax95gby6spvguldcMQ5fVv+RL9odTNLTwq
+ 3I6Ogm15TcjNLu8nhCIpxOkPv+B4A1FW5+NLFFpV+MVmSxGFyHVDMCwluaHz1RRwsXaYL5F1y4isNEa/
+ IOVqZVyput6YinNVryFslUM+m30Ip+2vcIqUXBlEScUgTpYPsOLL/ZYTZTl9OH5J6vP9BTA7SFAVdssX
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btnPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFN0YWNrZWRCYXIzRDszRDsQhC4B
+ AAAGg0lEQVRYR72XWVBTVxjHqfve5Vm7P7Z1tO1Mp7W1Koq2nWn71AfbzrggtoqCgqKguAuCYRFkMxC2
+ sMhicaMgilKoogiouFTHpRAWl7AYQghJ/v2+c+9NLhbi2Icy85vvnJub8//l3JvvBg/5bwQx8gUY9R8Z
+ LcNjXuclwmNERlHdmawj9XBHJlP8DEUyxZeRwRQNT3qhQp0gNb+2UpbwGJl6+BL+778k/XlQNu+Gxyht
+ viRgtdrRb7XJKGOuamywDHpdmltobumX51Td4XA4kJD1JwuMEQIpeRfhIAH1okMhQkSVj9FijHrxviFq
+ X/+APOc6ADsJHFQLJOfUkhXkhfmTSJ9GwIHqKiMtrMIihYgwizwXx+TKx+TXWCA+o4YFxrLA6CT9BUmA
+ TlAHtF8txc0Cf9zI98P13LW4pvfF1ezVuJK5Co3pK1Gf5oM0/WFsSK7GhqRqBBIBiX/AN+oUzBRqpjCp
+ uuhlAbsDB9KrXQKJ2eeFAJtaCA6/WZ6D2yVBsD9Mh71DR6TB3p4Ke9sh2FtTYL0VjPpbldDVdUB3qV2q
+ gnZ4+ehUgUSfVM1cCRaI0VW5BPh6sICZdsBM4dd/z8KtI4FwcPhDJVzrDLdReNPdKhTdeCwoVBGSWQfP
+ ZVop1InVWU1mK2wkEJ16jgXGscCY+MwacWcq1iXr5sNhbiKuEVfg6G0kGuAw1cNuLIfBeB8XO0xEL2pF
+ lcY7cy9jkW8BZv+cDJMcyoEmrhxOPFUEtGddAnEZ1eLG4DfwNhX5zkb3+WC05S1EWy6R44VW/QK0Zs/H
+ vZiPsDL9CnxkVggacfBcswhnZi1OkAIp7Kl5QIQKETG3YsDmgCalkgXGs8DYWLoefF3EFpFAvs+n6KoJ
+ koO90EbBrdmeMGTNw93omSJwhU4K9tbxuBGxlX87BT75IU4E9fRSICEqh/NYCNgRmawSiEmVBKTtskK/
+ 5GN0VQVSuCvYkDmXmIO7mhki1FvXAO80qsTytAZEVdyXPv1PKbR4uQgdDhaISDztEojWnhPXRVgSGYun
+ w1jph9YsVXjGHLSkf4k7+6eLwGVqUhsQUXYPc72zoEmtdAZ1K9UkjRWsA3aEJ1SwwAQWGKc5dNYpwG+I
+ ++ZdxH79DmK/Iha9jZiFbyHa601Eeb0BzYLX8eH3MUQ0EYWZ30nM+FaDOOonIoQDZbpUVaGfBMLiT7kE
+ 9tP1sNGNMchaWYjnXBXk15SFFbqeygFD1E4x7nce4267N66cBSaywPjIpDPizlQvyBgaTz63E9ZrV6Au
+ ZTkuJi9FbcISaDPz/tUZAxKrRHdkEYYFdseWuQT2xpeL6yKd0C+4Vqp32wlthmTYWhJhb0mArTke1qZA
+ DDw4gPobFcN2R2N3P4w9FtFpt0WVssAkIbD7QJmw6uyh8B4rrp7IdNsJ7RxuSFKFb4CNwpvunHbbHZ90
+ W0jCQs3OhtD9J5wCE3bRdkgCFnTSCe46ocNUB0fPJYKeoD0XSPAoHN01MDy+89zuyAIMN7wtkUJgshDY
+ EV1Kj1s7bY+0Re46ofhqDvpazhiyM/I4/pnu+Lirj5AEQiKPOwUmbmcB+g3A28OG7jqhEm6g8BbdbNyO
+ /GDIzsg1tvKBU4C746POPjwiCRO15+Dwoy6BUM1JcWM8ITsWcNcJleAW3RdoTvscf+17f8jOOKg7/piC
+ sIQyPGSBTgv1GxIIEwJTWGDSVroh+Mbg7eFtctcJObgljcJTZ6FZO4sE3huyMy7T1iOi/B4+W5yMfSmn
+ RbgCN7xNe0tcAiERx8VjmAV4m57XCTXzp0HjOQ37PaciYt7UYTsjE55cIUI75HCu3OiC9giBl1lgcnDE
+ MXFjcDifJK6VjGLtHrMcoFTXuENUZSzNuZNu3H1EJRB+TDyGlQWVRZQ3PXvcNVcvPnjczhj7pErHuHbw
+ 3CgJBO4SAq8Igc1hJeIxPFSYa9Hhxlw5TIU8VwLVx5hOavMBO4udAlP4evCd6VpcXlheRFRlUa7ya9KC
+ qhDVsTZ53PaEUL3G4056MAXsKHLtwMY9v4lfKnxzOKG58uRT6BKVnmpENy3CiKccwYuK54gyVh8TUJcl
+ jDQ2Ul233SUwfk2I/uz6HcVYT1YShXRCIfzpJP/tBfDfRoQWwC/0MNYyW4kt+VizNR++VJnVIXkSwblY
+ tZnJwSoa/0pVsCkHvzBBesFSv0NVlC2ehvyvOf804u8k35UMm70Ir74ArxH8Hgr3GPkPZRTj/e5gjecA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="btnFPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFN0YWNrZWRDb2x1bW4zRDszRDvW
+ itYeAAACs0lEQVQ4T2XS20sUURwH8PkbIrqgyBppIZuSCUUvGYQ9FD34kKCZZklSXtK08H7bpETH1bw9
+ 2Opm1oN5AS+r5WWxG5S2LwlRQRlFXnLvOzszO7vfzjnrbEkPn5nhzI/v+XF+h2t/ZJklcL+fes+0PVQt
+ Ma3GJej7qEW09C6CN7xjmh+8neUaul4jAASRR+j9n8AWwM8EUNv2Apyu4xVb9IoKBNFHKPCwt4+9g4Jr
+ bu9ffpJSrV8AV9/+kgWECslPlVo8vPgTV40WJvHWCFyCDIUEVLWYwdE2aDvBYnlL8JsWUud5M+a/umC0
+ WHE8dwBOQYKi+FHePA+uqmWBteMStu905EofnB6ZOdfwDBOfHUjuXkb8ZQPsbhkyCShtnANX2Wxm7dDC
+ s7opfLFKmCO7aVM74XBLTFLFGIaW7UjiLdCmdcHukiD7/Lh9dwZcWdM8fEoADhJwqnQUE5+cSDd8RFQy
+ T3aSmDf6HAjL3fjeehgj+adhdUqQZAUlDc+3B0xnn4Hb0ogVfTx6Eg6EAhbuZZKADhIQh8fZJ7YH0DYk
+ 0o6NtDWRchKupTv4xsejWxuJTafIzNSkQPjQRta1MKYfxW+7l425sG4aXDFJEWU/Nh0insRE4EdNHuZi
+ I9EavpMVUuOJCVhv18Ecq0FnVDjWyZqHTKmgxgSuSDcNr6SQQhH90WFYKcvB7CENmvbuwAZZo4aOabHK
+ V2LmYBj4iF1YtwlsvHnVk+AKa6fYJdogqYZ9e9ATSWh2w1RbhzWblxmI2w9jjAa90eEw1ddjzSrASUZ5
+ vWIcXEG1iV0cVkx+/GvV6t1Cv4N+bVIedrjXyklAbtUku0TqpaHoRBxkB5U6DTp/m0tkB24lh5tTOgYu
+ q2TUlFU8ikvFI8gkMm4OI6NoGBcLh0Iu3HjKpBWoBpGaTw2a/gBu+TxKuR3xJAAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnFPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFN0YWNrZWRDb2x1bW4zRDszRDvW
+ itYeAAAIh0lEQVRYR72X+VOV1xnHbcxmti5/QNtJ20k1xIXUNUmdzDhJapvJ0pnUTttf2kkaQ8EFiAJX
+ 8F7hAmURZJM1roAY14giGFxwQ3EpJlpFUZa7wL3cfWf59nme9+Xeq2MzY38oM585555zPc/nPOd5z3ud
+ ov49Rkx9BB7/H3lChfu8zveIKY9t23vp+I79V/BdbGf2PYS93F7GNmbvf2frnkkuCXVNF06oElOm1u3u
+ wv/7r7L+PCg2Z2PK47VNikAoNI5gaExlss9tNMp8IOo73A9QPxBU56j9LiYmJlCx4xwLPCkC1bsuYoIE
+ ogM8DAkirYKMP7C41x+CxxuAy+OHm+DW5fHBTWP+QAj+4CjGSaA8WqCq4QJZQV2Ud6LsRuBg0S0tMDnn
+ j8JHgTlIS2cvdNsvPhS3108SYyJQtu0sCzzFAk9U1ncqAg8sHukr49zyAuGgausPjNLiQTS19yCz/jJO
+ 3HOHuWL2YeP+61ga3wSHywsvC4xPoGTrmYjA5p3nRYAXChCTASSYGtDH42GUcR5jCR/1nW4fPi04g35n
+ 6D44+J/TW/BOXCMcThLw0xGQQPGWjogAnwcL+GiHyoJKIAkgqMEeglfFTov/Pf80Gq7ZUXXRisouKzqN
+ XgnOvLW8ATaHGx5fCGMkUFR3igWeZoEny7aflcp8cFFGxsha+tTyZ0630+2/j2GrXQS2d9tQccEqnB2M
+ CCz5tB4jJOCeFKg9GREo3XZGCoPTI0EkYEg+P4iDgrV29SF3dzfxL5VuZNVfxCd5Hdh61YbSTgtKz1tw
+ si8isPpv8bDaXCIwOjaBwuoTLDCNBZ7aROfB5yKPEAXxUBvdV6DgngAaj91C6eEenL7nQgfBbbfZi/ym
+ y/iYBOouj6D4nAVFRDsVIQcv0GVjy19iYRlxwSUC48ivihIorlME+HwkGLdRuH2Udhq30Tl/Qml20Ge7
+ b0xaB7Uc5I+pB0Vg09lhZB03CoduuZCv1aM980N88afZGLI64fIqAnmb2yMCRbWn5Fw4PWHoi+GWYHOr
+ 3UMCHdj1rQNldMZlnVZcMPrCAu3r34f/biN8PXVCaPgM2nTvo037HmqXzYSZBJy0Vmh0HLkVX7PAMyzw
+ dGHNybAAGzJOTxB2l/8+TBYHnfNp1FOll9AZM+fUQtMmp+FY+nvw3ayC95tioggh41G0ZryL1vR3UfVR
+ DEzDDjrGEIIkkFN2LCJQQOcxRoUhgQkO1trVLwWWo8L9TCq0jykD1fSYZZ8wCXzO+pQM7Ep4E8c0v4Pv
+ 3xUUvBDea4UIGppxJG2pUPn76TAO2RUBum2zS9tY4FkWmJZfeVwq00mTdhcXWg/K1EIT7k4W2hW0az+A
+ v7cBvhvl8F0vxyileX/iEhFoS/stjZfA2/1PITiwH4fXvoPmtW9j85JYGEjA7lYEsja1RgSyy9rkXHjS
+ YlcKzUbFZVOLjftVzTfknL+mNPtvVMJ7NRveK3oEja0i0EgCralL4aPUy9zVHATu7sFXyW+hadmbKH91
+ EQaMI7DRBvlmXb+xhQWeE4GsklaxsruCGB4hATrnxm+UQivnQjMphbYs5QDaKM3+6yXwXM6E51ImQgPN
+ YYGjtFsvjbk6NfCcT0OgZwt2/WEx6ha+hpLZC9BvtNKTFKDLbAwZBYfDAs9kUjoUgQCGLC6p9J3ddqpy
+ ulCIc4OKgDYpFa2c5msb4enSEusR7DsQFqiZ92tYavMxXK4XnM0NErx24SIUvTIXfQYLRkiAL7R1+SLw
+ vAjoilrodTtO6QlSpTup0E6j5tII8jvMyCOOq4XGQVpol+6uDXCdSRb8t3eKQN2Hr6N67hswF2pgyk6G
+ KScJtoYKCV6zYBEKZ8Ti3uAwrA5FQJPfHBZ4VssC9BuA02MccihplnPOlbMMGdsiu5y/GNaaPAwXZwiu
+ I7tR/9FilM2bj8pXX4c5by1M+kRiNWzbN6GagjN5L81Cb/8QLA4/XW6jSMv9KiKQUXhECmOE7AxmO46m
+ /IYKLBfu8ylCsG+fuss3UE1pNhdoYNywklgBe2OV7LBkLgu8BnPO5zBtWAVj5ipY6wpRPZ8EiJyfx+AO
+ C9gDdN+QQI4IvMACz6VTQXBhcHoGzTa0rHkbbiok58l4OE/FI3B7m+yylIJUUZpNuWtg1MbDsD4etp3l
+ EmATC8xZBFNWIgy6BBi0CbBW5qKK5jbPWwj9izPQOzCMYTv9VKMLLyX7YERAk9csr1kW6KdHhVNp5WJS
+ 0+xu2ytplCA0Z9InwZARh8H0OFi3FEuQnBmzUDF7IYy6lTRHcoSlPEuCF8bMQcPn6Rig7A6RAF94a/Ui
+ 8H0WeD4t75AUhoUm7xnox0QspZKKiRcz6lbAsecLFM38FbYmpsqcgdI/qPmMWA5rdQGKYmJRk7AG5bMW
+ yM5ZbHBdHMlrUfjyHOxM1uAO7d5Ej/iQ3Se37Zqs/VECuYfkdcvp6TfZsJlSWTA9lgpnNnJ/8Qr0P4vB
+ 7lQdvu3pl7ls+qx/8WVk/nQ6NvxkOuqT16H7xh2UzZyvjv0Suh+/JOxI0uA2BTeOeDBk88NsUwSSM0Xg
+ ByKQmnNQXsOcHpPVgz46BjbmM7szMITeQQulzwED3RE8fuuemTBJ29NnRj/VTT/N36Yiu9lrxM27BLU9
+ NN9HGzLSmmbaOQdn7HTlJ23YFxZ4gc+DK5MFIvjImKE+t+oC0qpzyoLKru6HNqL2TSNE1Bz37fSmTdLt
+ jWRgjf6AvO8nX8UCfeZUReOQNkgt/SakRRiHCi9qd6ttNDwmBAQb9W3UrtZGBKYlaOpPJur2IZGsFPbQ
+ F/ZgFX1plfZLrFpPZHyJlRm7sYJJJ9Y1ISG9CfHUMv/Q7FJIa0RcKtOAOOp/Rq2Q0oDlzNp64a8razoo
+ trwN+b/m/NOIn0muSobNHoUfPgI/IvjfUPApU/8DUnmm2NlLGrUAAAAASUVORK5CYII=
+</value>
+ </data>
<data name="btnGongZi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
--
Gitblit v1.9.3