diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 36ffbaf..3b4245b 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -544,16 +544,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Style = [fsBold] ParentFont = False end - object EndDate: TDateTimePicker - Left = 84 - Top = 34 - Width = 85 - Height = 20 - Date = 40675.464761099540000000 - Format = 'yyyy-MM-dd' - Time = 40675.464761099540000000 - TabOrder = 9 - end object OrderNo: TEdit Tag = 2 Left = 232 @@ -579,7 +569,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 11 + TabOrder = 10 OnChange = PRTCodeNameChange end object CDList: TEdit @@ -597,7 +587,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 10 + TabOrder = 9 OnChange = PRTCodeNameChange end object MJStr2: TComboBox @@ -608,7 +598,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Height = 20 Style = csDropDownList ItemHeight = 12 - TabOrder = 12 + TabOrder = 11 Visible = False OnChange = PRTCodeNameChange Items.Strings = ( @@ -656,7 +646,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 17 + TabOrder = 16 Visible = False end object MJType: TEdit @@ -665,7 +655,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Width = 93 Height = 20 ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 - TabOrder = 16 + TabOrder = 15 Visible = False end object BAOID: TEdit @@ -674,7 +664,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 13 + TabOrder = 12 OnChange = PRTCodeNameChange end object BAONO: TEdit @@ -701,7 +691,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 14 + TabOrder = 13 OnChange = PRTCodeNameChange end object MJstr4: TEdit @@ -719,7 +709,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 15 + TabOrder = 14 OnChange = PRTCodeNameChange end object CheckBox2: TCheckBox @@ -734,7 +724,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - TabOrder = 18 + TabOrder = 17 end object BegDate: TDateTimePicker Left = 84 @@ -754,7 +744,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Height = 20 Style = csDropDownList ItemHeight = 12 - TabOrder = 19 + TabOrder = 18 OnChange = PRTCodeNameChange Items.Strings = ( '' @@ -768,7 +758,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 35 Width = 76 Height = 20 - TabOrder = 20 + TabOrder = 19 OnChange = PRTCodeNameChange end object conNo: TEdit @@ -777,7 +767,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 11 Width = 77 Height = 20 - TabOrder = 21 + TabOrder = 20 OnChange = PRTCodeNameChange end object banno: TEdit @@ -786,9 +776,33 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 34 Width = 77 Height = 20 - TabOrder = 22 + TabOrder = 21 OnChange = PRTCodeNameChange end + object CheckBox3: TCheckBox + Left = 13 + Top = 37 + Width = 97 + Height = 17 + Caption = #20986#24211#26085#26399 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 22 + end + object EndDate: TDateTimePicker + Left = 84 + Top = 34 + Width = 85 + Height = 20 + Date = 40675.464761099540000000 + Format = 'yyyy-MM-dd' + Time = 40675.464761099540000000 + TabOrder = 23 + end end object cxGrid1: TcxGrid Left = 0 @@ -1111,6 +1125,11 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 70 end + object Tv1Column4: TcxGridDBColumn + Caption = #20986#24211#26102#38388 + DataBinding.FieldName = 'CKTime' + Options.Editing = False + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -1764,7 +1783,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne TabOrder = 12 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - Properties.TabIndex = 0 + Properties.TabIndex = 1 Properties.Tabs.Strings = ( #26410#20986#24211 #24050#20986#24211 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 5e2d3f1..a7b604a 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -1,7 +1,7 @@ unit U_JYOrderCDOne; interface - + uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, - cxCurrencyEdit, MMSystem, dxBarBuiltInMenu, cxPC; + cxCurrencyEdit, MMSystem, dxBarBuiltInMenu, cxPC, 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 TfrmJYOrderCDOne = class(TForm) @@ -21,7 +34,6 @@ type TBClose: TToolButton; Panel1: TPanel; BegDate: TDateTimePicker; - EndDate: TDateTimePicker; Tv1: TcxGridDBTableView; cxGrid1Level1: TcxGridLevel; cxGrid1: TcxGrid; @@ -196,6 +208,9 @@ type Tv1Column3: TcxGridDBColumn; Label35: TLabel; banno: TEdit; + Tv1Column4: TcxGridDBColumn; + CheckBox3: TCheckBox; + EndDate: TDateTimePicker; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -362,8 +377,17 @@ begin SQL.Add('from WFB_MJJY A'); sql.Add('inner join JYOrder_sub B on B.subID=A.subID '); sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID '); - sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); - sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); + if CheckBox3.Checked = True then + begin + sql.Add('where A.CKTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); + sql.Add('and A.CKTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); + end + else + begin + sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); + sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); + end; + if Trim(DParameters2) = 'Ʒ' then begin sql.add('and mjtype=''Ʒ'' '); @@ -852,6 +876,11 @@ begin sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); end; + if CheckBox3.Checked = True then + begin + sql.Add('and A.CKTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); + sql.Add('and A.CKTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); + end; Open; end; SCreateCDS20(ADOQueryMain, Order_Main); @@ -1729,12 +1758,13 @@ begin begin Close; sql.Clear; - sql.Add('update WFB_MJJY set CKFlag=''ѳ'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + sql.Add('update WFB_MJJY set CKFlag=''ѳ'',CKTime=getdate() where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; Edit; FieldByName('CKFlag').Value := 'ѳ'; + FieldByName('CKTime').Value := SGetServerDate10(ADOQueryTemp); Post; Next; @@ -1769,12 +1799,13 @@ begin begin Close; sql.Clear; - sql.Add('update WFB_MJJY set CKFlag=''δ'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + sql.Add('update WFB_MJJY set CKFlag=''δ'',CKTime=null where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; - - Edit; + + Edit; FieldByName('CKFlag').Value := 'δ'; + FieldByName('CKTime').Value :=null ; FieldByName('SSel').AsBoolean := False; Post; Next; @@ -1903,7 +1934,7 @@ begin begin Close; sql.Clear; - sql.Add('update WFB_MJJY set CKFlag=''ѳ'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + sql.Add('update WFB_MJJY set CKFlag=''ѳ'',CKTime=getdate() where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; PlaySound('wav\ȷ.wav', 0, SND_FILENAME or SND_ASYNC);