diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index 773d380..fcb75f9 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\֣ƽ\Ŀ\yichen\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7djYichen\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/U_CKProductBCPInList.dfm b/检验管理/U_CKProductBCPInList.dfm index 9076eb8..a5292d9 100644 --- a/检验管理/U_CKProductBCPInList.dfm +++ b/检验管理/U_CKProductBCPInList.dfm @@ -1,6 +1,6 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList - Left = 148 - Top = 43 + Left = 313 + Top = 217 Width = 1083 Height = 680 Caption = #25104#21697#20837#24211#21015#34920 @@ -20,7 +20,7 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1067 + Width = 1075 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -107,7 +107,8 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList #38144#21806#30721#21333 #38144#21806#30721#21333'1' #38144#21806#30721#21333'2' - #38144#21806#30721#21333#65288#31354#21152#20928#37325#65289) + #38144#21806#30721#21333#65288#31354#21152#20928#37325#65289 + #38144#21806#30917#30721#21333) end object TBClose: TToolButton Left = 562 @@ -121,7 +122,7 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object Panel1: TPanel Left = 0 Top = 33 - Width = 1067 + Width = 1075 Height = 76 Align = alTop BevelInner = bvRaised @@ -406,8 +407,8 @@ object frmCKProductBCPInList: TfrmCKProductBCPInList object cxGrid2: TcxGrid Left = 0 Top = 109 - Width = 1067 - Height = 532 + Width = 1075 + Height = 540 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 diff --git a/检验管理/U_CKProductBCPInList.pas b/检验管理/U_CKProductBCPInList.pas index dcf22e9..e3e0925 100644 --- a/检验管理/U_CKProductBCPInList.pas +++ b/检验管理/U_CKProductBCPInList.pas @@ -11,7 +11,20 @@ uses ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxLookAndFeels, cxLookAndFeelPainters, - cxNavigator; + cxNavigator, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmCKProductBCPInList = class(TForm) @@ -454,6 +467,35 @@ begin SCreateCDS20(ADOQueryTemp, CDS_PRT); SInitCDSData20(ADOQueryTemp, CDS_PRT); end; + if (trim(ComboBox1.Text) = '۰뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMD '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); +// sql.add(',@flag=''0'' '); +// sql.add(',@CNum=''10'' '); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_PRT); + SInitCDSData20(ADOQueryTemp, CDS_PRT); + end; if (trim(ComboBox1.Text) = 'ɫװ') or (trim(ComboBox1.Text) = 'ɫװ-') or (trim(ComboBox1.Text) = 'װ') then begin diff --git a/检验管理/U_CKProductBCPOutList.dfm b/检验管理/U_CKProductBCPOutList.dfm index 95c3fd1..ba19154 100644 --- a/检验管理/U_CKProductBCPOutList.dfm +++ b/检验管理/U_CKProductBCPOutList.dfm @@ -1,6 +1,6 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList - Left = 63 - Top = 145 + Left = 460 + Top = 247 Width = 1378 Height = 754 Caption = #25104#21697#20986#24211#21015#34920 @@ -20,7 +20,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1362 + Width = 1370 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -98,7 +98,8 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList #38144#21806#30721#21333 #38144#21806#30721#21333'1' #38144#21806#30721#21333'2' - #38144#21806#30721#21333#65288#31354#21152#20928#37325#65289) + #38144#21806#30721#21333#65288#31354#21152#20928#37325#65289 + #38144#21806#30917#30721#21333) end object TBClose: TToolButton Left = 475 @@ -112,7 +113,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object Panel1: TPanel Left = 0 Top = 33 - Width = 1362 + Width = 1370 Height = 80 Align = alTop BevelInner = bvRaised @@ -377,8 +378,8 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object cxGrid2: TcxGrid Left = 0 Top = 113 - Width = 1362 - Height = 602 + Width = 1370 + Height = 610 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 diff --git a/检验管理/U_CKProductBCPOutList.pas b/检验管理/U_CKProductBCPOutList.pas index d1ec687..f682c17 100644 --- a/检验管理/U_CKProductBCPOutList.pas +++ b/检验管理/U_CKProductBCPOutList.pas @@ -11,7 +11,20 @@ uses ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxCheckBox, Menus, MovePanel, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmCKProductBCPOutList = class(TForm) @@ -476,6 +489,34 @@ begin SInitCDSData20(ADOQueryTemp, CDS_PRT); end; + if (trim(ComboBox1.Text) = '۰뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMD '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_PRT); + SInitCDSData20(ADOQueryTemp, CDS_PRT); + end; + if trim(ComboBox1.Text) = 'ɫװ-10ɫ' then begin with ADOQueryTemp do diff --git a/检验管理/U_CKProductRKHZList.dfm b/检验管理/U_CKProductRKHZList.dfm index 3437adc..c74eca2 100644 --- a/检验管理/U_CKProductRKHZList.dfm +++ b/检验管理/U_CKProductRKHZList.dfm @@ -20,7 +20,7 @@ object frmCKProductRKHZList: TfrmCKProductRKHZList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1116 + Width = 1124 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -91,7 +91,7 @@ object frmCKProductRKHZList: TfrmCKProductRKHZList object Panel1: TPanel Left = 0 Top = 33 - Width = 1116 + Width = 1124 Height = 68 Align = alTop BevelInner = bvRaised @@ -339,13 +339,13 @@ object frmCKProductRKHZList: TfrmCKProductRKHZList object cxGrid2: TcxGrid Left = 0 Top = 101 - Width = 1116 - Height = 491 + Width = 1124 + Height = 498 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp - NavigatorButtons.ConfirmDelete = False + Navigator.Buttons.CustomButtons = <> OnCellDblClick = Tv1CellDblClick DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = <> diff --git a/检验管理/U_CKProductRKHZList.pas b/检验管理/U_CKProductRKHZList.pas index a9f8410..5a55445 100644 --- a/检验管理/U_CKProductRKHZList.pas +++ b/检验管理/U_CKProductRKHZList.pas @@ -10,7 +10,22 @@ uses cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, MovePanel, cxButtonEdit, - cxCalendar, RM_System, RM_Common, RM_Class, RM_GridReport; + cxCalendar, RM_System, RM_Common, RM_Class, RM_GridReport, + cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter, + cxNavigator; type TfrmCKProductRKHZList = class(TForm) diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index 59f86d6..cf61e73 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -1,6 +1,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 88 - Top = 15 + Left = 230 + Top = 173 Width = 1265 Height = 738 Caption = #25104#21697#26816#39564 @@ -19,9 +19,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF TextHeight = 12 object cxGrid3: TcxGrid Left = 0 - Top = 81 + Top = 105 Width = 225 - Height = 618 + Height = 602 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -115,9 +115,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object ScrollBox1: TScrollBox Left = 601 - Top = 81 - Width = 648 - Height = 618 + Top = 105 + Width = 656 + Height = 602 Align = alClient TabOrder = 1 object SpeedButton13: TSpeedButton @@ -1104,9 +1104,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel2: TPanel Left = 401 - Top = 81 + Top = 105 Width = 200 - Height = 618 + Height = 602 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1982,8 +1982,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel4: TPanel Left = 0 Top = 0 - Width = 1249 - Height = 81 + Width = 1257 + Height = 105 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered @@ -1991,15 +1991,15 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel5: TPanel Left = 2 Top = 2 - Width = 1245 - Height = 77 + Width = 1253 + Height = 101 Align = alClient TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1243 - Height = 48 + Width = 1251 + Height = 74 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered @@ -2110,6 +2110,19 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False Visible = False end + object Label53: TLabel + Left = 903 + Top = 46 + Width = 40 + Height = 19 + Caption = #21367#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object APID: TEdit Left = 92 Top = 16 @@ -2218,11 +2231,31 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Visible = False OnClick = Edit9Click end + object ComboBox2: TComboBox + Left = 944 + Top = 40 + Width = 74 + Height = 32 + Style = csDropDownList + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -24 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ItemHeight = 24 + ItemIndex = 0 + ParentFont = False + TabOrder = 7 + Text = #33258#21160 + Items.Strings = ( + #33258#21160 + #25163#36755) + end end object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1243 + Width = 1251 Height = 30 ButtonHeight = 30 ButtonWidth = 83 @@ -2283,6 +2316,60 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ImageIndex = 55 OnClick = TBCloseClick end + object Label51: TLabel + Left = 339 + Top = 0 + Width = 84 + Height = 30 + Caption = #21367#21495#33539#22260 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object MinRollNo: TEdit + Left = 423 + Top = 0 + Width = 57 + Height = 30 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 0 + OnClick = Edit1Click + end + object Label52: TLabel + Left = 480 + Top = 0 + Width = 14 + Height = 30 + Caption = '-' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -25 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object MaxRollNo: TEdit + Left = 494 + Top = 0 + Width = 57 + Height = 30 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 1 + OnClick = Edit1Click + end end end end @@ -2539,9 +2626,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel7: TPanel Left = 225 - Top = 81 + Top = 105 Width = 176 - Height = 618 + Height = 602 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2550,7 +2637,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 172 - Height = 289 + Height = 273 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2659,7 +2746,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 291 + Top = 275 Width = 172 Height = 41 Align = alBottom @@ -2674,7 +2761,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 332 + Top = 316 Width = 172 Height = 284 Align = alBottom @@ -2690,9 +2777,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object Panel3: TPanel - Left = 40 + Left = 48 Top = 376 - Width = 283 + Width = 353 Height = 279 BevelInner = bvRaised BevelOuter = bvLowered @@ -2701,7 +2788,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Visible = False object SpeedButton1: TSpeedButton Left = 2 - Top = 207 + Top = 209 Width = 140 Height = 70 Caption = '0' @@ -2855,7 +2942,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = SpeedButton1Click end object SpeedButton12: TSpeedButton - Left = 212 + Left = 211 Top = 2 Width = 70 Height = 70 @@ -2871,9 +2958,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object SpeedButton49: TSpeedButton Tag = 9 Left = 211 - Top = 72 + Top = 139 Width = 70 - Height = 206 + Height = 142 Caption = #38544#34255 Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -2883,6 +2970,399 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False OnClick = SpeedButton49Click end + object SpeedButton84: TSpeedButton + Tag = 9 + Left = 280 + Top = 0 + Width = 73 + Height = 278 + Caption = #23383#27597 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -29 + Font.Name = #26999#20307'_GB2312' + Font.Style = [fsBold] + ParentFont = False + OnClick = SpeedButton84Click + end + object SpeedButton85: TSpeedButton + Left = 350 + Top = 139 + Width = 70 + Height = 70 + Caption = 'O' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton86: TSpeedButton + Left = 420 + Top = 139 + Width = 70 + Height = 70 + Caption = 'P' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton87: TSpeedButton + Left = 490 + Top = 139 + Width = 70 + Height = 70 + Caption = 'Q' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton88: TSpeedButton + Left = 350 + Top = 71 + Width = 70 + Height = 70 + Caption = 'H' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton89: TSpeedButton + Left = 420 + Top = 71 + Width = 70 + Height = 70 + Caption = 'I' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton90: TSpeedButton + Left = 490 + Top = 71 + Width = 70 + Height = 70 + Caption = 'J' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton91: TSpeedButton + Left = 350 + Top = 3 + Width = 70 + Height = 70 + Caption = 'A' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton92: TSpeedButton + Left = 420 + Top = 3 + Width = 70 + Height = 70 + Caption = 'B' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton93: TSpeedButton + Left = 490 + Top = 3 + Width = 70 + Height = 70 + Caption = 'C' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton94: TSpeedButton + Left = 560 + Top = 139 + Width = 70 + Height = 70 + Caption = 'R' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton95: TSpeedButton + Left = 630 + Top = 139 + Width = 70 + Height = 70 + Caption = 'S' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton96: TSpeedButton + Left = 700 + Top = 139 + Width = 70 + Height = 70 + Caption = 'T' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton97: TSpeedButton + Left = 560 + Top = 71 + Width = 70 + Height = 70 + Caption = 'K' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton98: TSpeedButton + Left = 630 + Top = 71 + Width = 70 + Height = 70 + Caption = 'L' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton99: TSpeedButton + Left = 700 + Top = 71 + Width = 70 + Height = 70 + Caption = 'M' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton100: TSpeedButton + Left = 560 + Top = 3 + Width = 70 + Height = 70 + Caption = 'D' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton101: TSpeedButton + Left = 630 + Top = 3 + Width = 70 + Height = 70 + Caption = 'E' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton102: TSpeedButton + Left = 700 + Top = 3 + Width = 70 + Height = 70 + Caption = 'F' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton103: TSpeedButton + Left = 770 + Top = 139 + Width = 70 + Height = 70 + Caption = 'U' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton104: TSpeedButton + Left = 770 + Top = 71 + Width = 70 + Height = 70 + Caption = 'N' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton105: TSpeedButton + Left = 770 + Top = 3 + Width = 70 + Height = 70 + Caption = 'G' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton106: TSpeedButton + Left = 350 + Top = 209 + Width = 70 + Height = 70 + Caption = 'V' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton107: TSpeedButton + Left = 420 + Top = 209 + Width = 70 + Height = 70 + Caption = 'W' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton108: TSpeedButton + Left = 490 + Top = 209 + Width = 70 + Height = 70 + Caption = 'X' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton109: TSpeedButton + Left = 560 + Top = 209 + Width = 70 + Height = 70 + Caption = 'Y' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton110: TSpeedButton + Left = 630 + Top = 209 + Width = 70 + Height = 70 + Caption = 'Z' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton111: TSpeedButton + Left = 210 + Top = 71 + Width = 70 + Height = 70 + Caption = '-' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end end object cxStyleRepository1: TcxStyleRepository Left = 612 @@ -2910,7 +3390,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object cxGridPopupMenu1: TcxGridPopupMenu PopupMenus = <> - Left = 400 + Left = 448 + Top = 48 end object DataSource1: TDataSource DataSet = Order_MJ @@ -2920,19 +3401,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Order_MJ: TClientDataSet Aggregates = <> Params = <> - Left = 560 - Top = 8 + Left = 576 + Top = 32 end object ADOQueryMain: TADOQuery Connection = DataLink_TradeManage.ADOLink LockType = ltReadOnly Parameters = <> - Left = 576 + Left = 600 + Top = 48 end object ADOCmd: TADOQuery Connection = DataLink_TradeManage.ADOLink Parameters = <> - Left = 536 + Left = 552 + Top = 40 end object ADOTmp: TADOQuery Connection = DataLink_TradeManage.ADOLink @@ -2964,7 +3447,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF CompressThread = False LaterBuildEvents = True OnlyOwnerDataSet = False - Left = 464 + Left = 520 + Top = 56 ReportData = {} end object DataSource2: TDataSource diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 5d12405..5021fcf 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -10,7 +10,20 @@ uses cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, - MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, + dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, + dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, + dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, + dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, + dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, + dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmMJManageNewFDNewSF = class(TForm) @@ -252,6 +265,40 @@ type Label49: TLabel; MJSJKZ1: TEdit; Label50: TLabel; + Label51: TLabel; + MinRollNo: TEdit; + Label52: TLabel; + MaxRollNo: TEdit; + Label53: TLabel; + ComboBox2: TComboBox; + SpeedButton84: TSpeedButton; + SpeedButton85: TSpeedButton; + SpeedButton86: TSpeedButton; + SpeedButton87: TSpeedButton; + SpeedButton88: TSpeedButton; + SpeedButton89: TSpeedButton; + SpeedButton90: TSpeedButton; + SpeedButton91: TSpeedButton; + SpeedButton92: TSpeedButton; + SpeedButton93: TSpeedButton; + SpeedButton94: TSpeedButton; + SpeedButton95: TSpeedButton; + SpeedButton96: TSpeedButton; + SpeedButton97: TSpeedButton; + SpeedButton98: TSpeedButton; + SpeedButton99: TSpeedButton; + SpeedButton100: TSpeedButton; + SpeedButton101: TSpeedButton; + SpeedButton102: TSpeedButton; + SpeedButton103: TSpeedButton; + SpeedButton104: TSpeedButton; + SpeedButton105: TSpeedButton; + SpeedButton106: TSpeedButton; + SpeedButton107: TSpeedButton; + SpeedButton108: TSpeedButton; + SpeedButton109: TSpeedButton; + SpeedButton110: TSpeedButton; + SpeedButton111: TSpeedButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -310,6 +357,7 @@ type procedure Edit9Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); procedure Button7Click(Sender: TObject); + procedure SpeedButton84Click(Sender: TObject); private { Private declarations } FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer; @@ -939,49 +987,71 @@ begin if PState = 1 then begin - if fRollType = '' then + if ComboBox2.ItemIndex = 0 then begin - with ADOCmd do + if fRollType = '' then begin - Close; - sql.Clear; - sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); - sql.Add('from WFB_MJJY X where X.mainID=''' + trim(fmainId) + ''' '); - Open; - MJXH.Text := Trim(fieldbyname('maxRoll').AsString); - end; - end - else if fRollType = '׺' then - begin - with ADOCmd do + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); + sql.Add('from WFB_MJJY X where X.mainID=''' + trim(fmainId) + ''' '); + Open; + MJXH.Text := Trim(fieldbyname('maxRoll').AsString); + end; + end + else if fRollType = '׺' then + begin + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); + sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' '); + sql.add('and X.MJStr4=' + quotedstr(trim(MJstr4.text))); + Open; + MJXH.Text := Trim(fieldbyname('maxRoll').AsString); + end; + end + else if fRollType = '޹' then begin - Close; - sql.Clear; - sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); - sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' '); - sql.add('and X.MJStr4=' + quotedstr(trim(MJstr4.text))); - Open; - MJXH.Text := Trim(fieldbyname('maxRoll').AsString); - end; - end - else if fRollType = '޹' then - begin - end - else - begin - with ADOCmd do + end + else begin - Close; - sql.Clear; - sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); - sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' '); - Open; - MJXH.Text := Trim(fieldbyname('maxRoll').AsString); + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) '); + sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' '); + Open; + MJXH.Text := Trim(fieldbyname('maxRoll').AsString); + end; end; end; end; + + if minRollNo.Text <> '' then + begin + if StrToIntDef(minRollNo.Text, 0) > StrToIntDef(MJXH.Text, 0) then + begin + Application.MessageBox('ССţܱ棡', 'ʾ', 0); + exit; + end; + end; + + if MaxRollNo.Text <> '' then + begin + if StrToIntDef(MaxRollNo.Text, 0) < StrToIntDef(MJXH.Text, 0) then + begin + Application.MessageBox('ѳţܱ棡', 'ʾ', 0); + exit; + end; + end; + try ADOCmd.Connection.BeginTrans; @@ -1084,44 +1154,47 @@ begin end; if PState = 1 then begin - if fRollType = '' then + if ComboBox2.ItemIndex = 0 then begin - with ADOCmd do + if fRollType = '' then begin - Close; - sql.Clear; - sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.mainID=WFB_MJJY.mainID and X.MJID<>WFB_MJJY.MJID),0)'); - sql.Add('where MJID=''' + Trim(maxno) + ''''); - execsql; - end; - end - else if fRollType = '׺' then - begin - with ADOCmd do + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.mainID=WFB_MJJY.mainID and X.MJID<>WFB_MJJY.MJID),0)'); + sql.Add('where MJID=''' + Trim(maxno) + ''''); + execsql; + end; + end + else if fRollType = '׺' then begin - Close; - sql.Clear; - sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.subID=WFB_MJJY.subID and X.mjstr4=WFB_MJJY.mjstr4 and X.MJID<>WFB_MJJY.MJID),0)'); - sql.Add('where MJID=''' + Trim(maxno) + ''''); - execsql; - end; - end - else if fRollType = '޹' then - begin - with ADOCmd do + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.subID=WFB_MJJY.subID and X.mjstr4=WFB_MJJY.mjstr4 and X.MJID<>WFB_MJJY.MJID),0)'); + sql.Add('where MJID=''' + Trim(maxno) + ''''); + execsql; + end; + end + else if fRollType = '޹' then begin + with ADOCmd do + begin - end; - end - else - begin - with ADOCmd do + end; + end + else begin - Close; - sql.Clear; - sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.subID=WFB_MJJY.subID and X.MJID<>WFB_MJJY.MJID),0)'); - sql.Add('where MJID=''' + Trim(maxno) + ''''); - execsql; + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X where X.subID=WFB_MJJY.subID and X.MJID<>WFB_MJJY.MJID),0)'); + sql.Add('where MJID=''' + Trim(maxno) + ''''); + execsql; + end; end; end; end; @@ -1245,14 +1318,14 @@ begin application.MessageBox('ȻܶΪ㣡', 'ʾϢ', 0); exit; end; - if Trim(MJstr4.Text) <> '' then - begin - if TryStrToint(MJstr4.Text, mvalue1) = False then - begin - Application.MessageBox('׺!', 'ʾ', 0); - Exit; - end; - end; +// if Trim(MJstr4.Text) <> '' then +// begin +// if TryStrToint(MJstr4.Text, mvalue1) = False then +// begin +// Application.MessageBox('׺!', 'ʾ', 0); +// Exit; +// end; +// end; if Trim(FAPID) = '' then Exit; @@ -1303,22 +1376,25 @@ begin end; end; - if fRollType = '޹' then + if ComboBox2.ItemIndex = 0 then begin - - with ADOCmd do + if fRollType = '޹' then begin - Close; - sql.Clear; - sql.Add('select * from WFB_MJJY where MainId=''' + trim(fmainId) + ''' and MJXH=' + MJXH.Text + ''); - Open; - end; - if ADOCmd.RecordCount <> 0 then - begin - Application.MessageBox('ظ!', 'ʾ', 0); - Exit; - end; + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('select * from WFB_MJJY where MainId=''' + trim(fmainId) + ''' and MJXH=' + MJXH.Text + ''); + Open; + end; + if ADOCmd.RecordCount <> 0 then + begin + Application.MessageBox('ظ!', 'ʾ', 0); + Exit; + end; + + end; end; if SaveData() then @@ -1333,6 +1409,10 @@ begin MJXH.Text := inttostr(strTointdef(trim(MJXH.Text), 0) + 1); + mjfk.Text := ''; + mjfk1.Text := ''; + MJSJKZ.text := ''; + MJSJKZ1.text := ''; if PState = 2 then begin apid.Text := FAPID; @@ -2079,8 +2159,7 @@ begin FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString); FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString); FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString); - AOrdDefNote1.Text := 'װҪ:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13 - //+':'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13 + AOrdDefNote1.Text := 'װҪ:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13 //+':'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13 //+'̽:'+Trim(ADOTmp.fieldbyname('MPRTTangJin').AsString)+#13 //+':'+Trim(ADOTmp.fieldbyname('MPRTKaiJian').AsString)+#13 // +'ŷ:'+Trim(ADOTmp.fieldbyname('PRTMF').AsString)+#13 @@ -2464,5 +2543,13 @@ begin end; +procedure TfrmMJManageNewFDNewSF.SpeedButton84Click(Sender: TObject); +begin + if panel3.Width > 400 then + panel3.Width := 350 + else + panel3.Width := 840; +end; + end.