This commit is contained in:
DESKTOP-E401PHE\Administrator 2026-02-05 17:25:58 +08:00
parent 70761692ee
commit f569c4a8a6
2 changed files with 84 additions and 34 deletions

View File

@ -544,16 +544,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
end 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 object OrderNo: TEdit
Tag = 2 Tag = 2
Left = 232 Left = 232
@ -579,7 +569,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 11 TabOrder = 10
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object CDList: TEdit object CDList: TEdit
@ -597,7 +587,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 10 TabOrder = 9
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object MJStr2: TComboBox object MJStr2: TComboBox
@ -608,7 +598,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Height = 20 Height = 20
Style = csDropDownList Style = csDropDownList
ItemHeight = 12 ItemHeight = 12
TabOrder = 12 TabOrder = 11
Visible = False Visible = False
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
Items.Strings = ( Items.Strings = (
@ -656,7 +646,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Font.Name = #23435#20307 Font.Name = #23435#20307
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 17 TabOrder = 16
Visible = False Visible = False
end end
object MJType: TEdit object MJType: TEdit
@ -665,7 +655,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Width = 93 Width = 93
Height = 20 Height = 20
ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
TabOrder = 16 TabOrder = 15
Visible = False Visible = False
end end
object BAOID: TEdit object BAOID: TEdit
@ -674,7 +664,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 13 TabOrder = 12
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object BAONO: TEdit object BAONO: TEdit
@ -701,7 +691,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 14 TabOrder = 13
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object MJstr4: TEdit object MJstr4: TEdit
@ -719,7 +709,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 15 TabOrder = 14
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object CheckBox2: TCheckBox object CheckBox2: TCheckBox
@ -734,7 +724,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Font.Name = #23435#20307 Font.Name = #23435#20307
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 18 TabOrder = 17
end end
object BegDate: TDateTimePicker object BegDate: TDateTimePicker
Left = 84 Left = 84
@ -754,7 +744,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Height = 20 Height = 20
Style = csDropDownList Style = csDropDownList
ItemHeight = 12 ItemHeight = 12
TabOrder = 19 TabOrder = 18
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
Items.Strings = ( Items.Strings = (
'' ''
@ -768,7 +758,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 35 Top = 35
Width = 76 Width = 76
Height = 20 Height = 20
TabOrder = 20 TabOrder = 19
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object conNo: TEdit object conNo: TEdit
@ -777,7 +767,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 11 Top = 11
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 21 TabOrder = 20
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end end
object banno: TEdit object banno: TEdit
@ -786,9 +776,33 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 34 Top = 34
Width = 77 Width = 77
Height = 20 Height = 20
TabOrder = 22 TabOrder = 21
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
end 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 end
object cxGrid1: TcxGrid object cxGrid1: TcxGrid
Left = 0 Left = 0
@ -1111,6 +1125,11 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
HeaderAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter
Width = 70 Width = 70
end end
object Tv1Column4: TcxGridDBColumn
Caption = #20986#24211#26102#38388
DataBinding.FieldName = 'CKTime'
Options.Editing = False
end
end end
object cxGrid1Level1: TcxGridLevel object cxGrid1Level1: TcxGridLevel
GridView = Tv1 GridView = Tv1
@ -1764,7 +1783,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
TabOrder = 12 TabOrder = 12
Properties.CustomButtons.Buttons = <> Properties.CustomButtons.Buttons = <>
Properties.Style = 9 Properties.Style = 9
Properties.TabIndex = 0 Properties.TabIndex = 1
Properties.Tabs.Strings = ( Properties.Tabs.Strings = (
#26410#20986#24211 #26410#20986#24211
#24050#20986#24211 #24050#20986#24211

View File

@ -11,7 +11,20 @@ uses
cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, 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 type
TfrmJYOrderCDOne = class(TForm) TfrmJYOrderCDOne = class(TForm)
@ -21,7 +34,6 @@ type
TBClose: TToolButton; TBClose: TToolButton;
Panel1: TPanel; Panel1: TPanel;
BegDate: TDateTimePicker; BegDate: TDateTimePicker;
EndDate: TDateTimePicker;
Tv1: TcxGridDBTableView; Tv1: TcxGridDBTableView;
cxGrid1Level1: TcxGridLevel; cxGrid1Level1: TcxGridLevel;
cxGrid1: TcxGrid; cxGrid1: TcxGrid;
@ -196,6 +208,9 @@ type
Tv1Column3: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn;
Label35: TLabel; Label35: TLabel;
banno: TEdit; banno: TEdit;
Tv1Column4: TcxGridDBColumn;
CheckBox3: TCheckBox;
EndDate: TDateTimePicker;
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
@ -362,8 +377,17 @@ begin
SQL.Add('from WFB_MJJY A'); SQL.Add('from WFB_MJJY A');
sql.Add('inner join JYOrder_sub B on B.subID=A.subID '); 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('inner join JYOrder_Main C on C.MainID=A.MainID ');
sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); if CheckBox3.Checked = True then
sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); 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 if Trim(DParameters2) = '次品' then
begin begin
sql.add('and mjtype=''次品'' '); 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', BegDate.DateTime) + ''' ');
sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
end; 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; Open;
end; end;
SCreateCDS20(ADOQueryMain, Order_Main); SCreateCDS20(ADOQueryMain, Order_Main);
@ -1729,12 +1758,13 @@ begin
begin begin
Close; Close;
sql.Clear; 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; ExecSQL;
end; end;
Edit; Edit;
FieldByName('CKFlag').Value := '已出库'; FieldByName('CKFlag').Value := '已出库';
FieldByName('CKTime').Value := SGetServerDate10(ADOQueryTemp);
Post; Post;
Next; Next;
@ -1769,12 +1799,13 @@ begin
begin begin
Close; Close;
sql.Clear; 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; ExecSQL;
end; end;
Edit; Edit;
FieldByName('CKFlag').Value := '未出库'; FieldByName('CKFlag').Value := '未出库';
FieldByName('CKTime').Value :=null ;
FieldByName('SSel').AsBoolean := False; FieldByName('SSel').AsBoolean := False;
Post; Post;
Next; Next;
@ -1903,7 +1934,7 @@ begin
begin begin
Close; Close;
sql.Clear; 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; ExecSQL;
end; end;
PlaySound('wav\正确.wav', 0, SND_FILENAME or SND_ASYNC); PlaySound('wav\正确.wav', 0, SND_FILENAME or SND_ASYNC);