~
This commit is contained in:
parent
1d3cb2226f
commit
0e7c3b5104
|
|
@ -133,19 +133,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25209#37327#20462#25913#30382#37325
|
Caption = #25209#37327#20462#25913#30382#37325
|
||||||
ImageIndex = 54
|
ImageIndex = 54
|
||||||
Wrap = True
|
|
||||||
OnClick = ToolButton8Click
|
OnClick = ToolButton8Click
|
||||||
end
|
end
|
||||||
object ToolButton1: TToolButton
|
object ToolButton1: TToolButton
|
||||||
Left = 0
|
Left = 1064
|
||||||
Top = 30
|
Top = 0
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25171#21360#26631#31614
|
Caption = #25171#21360#26631#31614
|
||||||
ImageIndex = 96
|
ImageIndex = 96
|
||||||
|
Wrap = True
|
||||||
OnClick = ToolButton1Click
|
OnClick = ToolButton1Click
|
||||||
end
|
end
|
||||||
object TCPDB: TToolButton
|
object TCPDB: TToolButton
|
||||||
Left = 87
|
Left = 0
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25104#21697#25171#21253
|
Caption = #25104#21697#25171#21253
|
||||||
|
|
@ -153,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnClick = TCPDBClick
|
OnClick = TCPDBClick
|
||||||
end
|
end
|
||||||
object ToolButton3: TToolButton
|
object ToolButton3: TToolButton
|
||||||
Left = 174
|
Left = 87
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25171#21360#21253#26631#31614
|
Caption = #25171#21360#21253#26631#31614
|
||||||
|
|
@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnClick = ToolButton3Click
|
OnClick = ToolButton3Click
|
||||||
end
|
end
|
||||||
object ToolButton2: TToolButton
|
object ToolButton2: TToolButton
|
||||||
Left = 273
|
Left = 186
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25171#21360#26816#39564#25253#21578
|
Caption = #25171#21360#26816#39564#25253#21578
|
||||||
|
|
@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnClick = ToolButton2Click
|
OnClick = ToolButton2Click
|
||||||
end
|
end
|
||||||
object ToolButton5: TToolButton
|
object ToolButton5: TToolButton
|
||||||
Left = 384
|
Left = 297
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #25171#21360
|
Caption = #25171#21360
|
||||||
|
|
@ -178,7 +178,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnClick = ToolButton5Click
|
OnClick = ToolButton5Click
|
||||||
end
|
end
|
||||||
object Edit3: TEdit
|
object Edit3: TEdit
|
||||||
Left = 447
|
Left = 360
|
||||||
Top = 30
|
Top = 30
|
||||||
Width = 68
|
Width = 68
|
||||||
Height = 30
|
Height = 30
|
||||||
|
|
@ -193,7 +193,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnKeyPress = Edit3KeyPress
|
OnKeyPress = Edit3KeyPress
|
||||||
end
|
end
|
||||||
object ComboBox1: TComboBox
|
object ComboBox1: TComboBox
|
||||||
Left = 515
|
Left = 428
|
||||||
Top = 33
|
Top = 33
|
||||||
Width = 149
|
Width = 149
|
||||||
Height = 24
|
Height = 24
|
||||||
|
|
@ -217,7 +217,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
#26816#39564#30721#21333'('#20013#25991#20116#21015')')
|
#26816#39564#30721#21333'('#20013#25991#20116#21015')')
|
||||||
end
|
end
|
||||||
object Edit4: TEdit
|
object Edit4: TEdit
|
||||||
Left = 664
|
Left = 577
|
||||||
Top = 30
|
Top = 30
|
||||||
Width = 121
|
Width = 121
|
||||||
Height = 30
|
Height = 30
|
||||||
|
|
@ -231,15 +231,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
Visible = False
|
Visible = False
|
||||||
end
|
end
|
||||||
object ToolButton12: TToolButton
|
object ToolButton12: TToolButton
|
||||||
Left = 785
|
Left = 698
|
||||||
Top = 30
|
Top = 30
|
||||||
|
AutoSize = True
|
||||||
Caption = #20462#25913#30721#21333
|
Caption = #20462#25913#30721#21333
|
||||||
ImageIndex = 54
|
ImageIndex = 54
|
||||||
Visible = False
|
Visible = False
|
||||||
OnClick = ToolButton12Click
|
OnClick = ToolButton12Click
|
||||||
end
|
end
|
||||||
object ToolButton9: TToolButton
|
object ToolButton9: TToolButton
|
||||||
Left = 904
|
Left = 785
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #24322#24120#25968#25454
|
Caption = #24322#24120#25968#25454
|
||||||
|
|
@ -247,29 +248,29 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
OnClick = ToolButton9Click
|
OnClick = ToolButton9Click
|
||||||
end
|
end
|
||||||
object TBExport: TToolButton
|
object TBExport: TToolButton
|
||||||
Left = 991
|
Left = 872
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #21246#36873#23548#20986
|
Caption = #21246#36873#23548#20986
|
||||||
ImageIndex = 75
|
ImageIndex = 75
|
||||||
OnClick = TBExportClick
|
OnClick = TBExportClick
|
||||||
end
|
end
|
||||||
object TBClose: TToolButton
|
|
||||||
Left = 1078
|
|
||||||
Top = 30
|
|
||||||
AutoSize = True
|
|
||||||
Caption = #20851#38381
|
|
||||||
ImageIndex = 55
|
|
||||||
OnClick = TBCloseClick
|
|
||||||
end
|
|
||||||
object ToolButton14: TToolButton
|
object ToolButton14: TToolButton
|
||||||
Left = 1141
|
Left = 959
|
||||||
Top = 30
|
Top = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Caption = #23548#20986
|
Caption = #23548#20986
|
||||||
ImageIndex = 75
|
ImageIndex = 75
|
||||||
OnClick = ToolButton14Click
|
OnClick = ToolButton14Click
|
||||||
end
|
end
|
||||||
|
object TBClose: TToolButton
|
||||||
|
Left = 1022
|
||||||
|
Top = 30
|
||||||
|
AutoSize = True
|
||||||
|
Caption = #20851#38381
|
||||||
|
ImageIndex = 55
|
||||||
|
OnClick = TBCloseClick
|
||||||
|
end
|
||||||
end
|
end
|
||||||
object Panel1: TPanel
|
object Panel1: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
|
|
|
||||||
|
|
@ -599,7 +599,6 @@ begin
|
||||||
// sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
|
// sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
|
||||||
sql.Add(' where EXISTS(select SubId from TBSubID X where X.SubId=A.MJID and X.DName=''' + Trim(DCode) + ''' )');
|
sql.Add(' where EXISTS(select SubId from TBSubID X where X.SubId=A.MJID and X.DName=''' + Trim(DCode) + ''' )');
|
||||||
|
|
||||||
|
|
||||||
sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
|
sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
|
||||||
// ShowMessage(sql.text);
|
// ShowMessage(sql.text);
|
||||||
Open;
|
Open;
|
||||||
|
|
@ -2311,6 +2310,8 @@ begin
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TfrmJYOrderCDOne.Button8Click(Sender: TObject);
|
procedure TfrmJYOrderCDOne.Button8Click(Sender: TObject);
|
||||||
|
var
|
||||||
|
Fxsws: Integer;
|
||||||
begin
|
begin
|
||||||
if Order_Main.IsEmpty then
|
if Order_Main.IsEmpty then
|
||||||
Exit;
|
Exit;
|
||||||
|
|
@ -2330,13 +2331,22 @@ begin
|
||||||
begin
|
begin
|
||||||
if Order_Main.FieldByName('SSel').AsBoolean = True then
|
if Order_Main.FieldByName('SSel').AsBoolean = True then
|
||||||
begin
|
begin
|
||||||
|
with ADOQueryTemp do
|
||||||
|
begin
|
||||||
|
Close;
|
||||||
|
sql.Clear;
|
||||||
|
sql.Add('select xsws from JYorder_main where mainid=''' + Trim(Order_Main.fieldbyname('mainid').AsString) + '''');
|
||||||
|
Open;
|
||||||
|
end;
|
||||||
|
Fxsws := ADOQueryTemp.fieldbyname('xsws').AsInteger;
|
||||||
with ADOQueryCmd do
|
with ADOQueryCmd do
|
||||||
begin
|
begin
|
||||||
Close;
|
Close;
|
||||||
sql.Clear;
|
sql.Clear;
|
||||||
sql.Add('Update JYOrder_Sub Set kmxs=''' + trim(Edit5.Text) + ''' ');
|
sql.Add('Update JYOrder_Sub Set kmxs=''' + trim(Edit5.Text) + ''' ');
|
||||||
sql.Add('where subid=''' + Trim(Order_Main.fieldbyname('subid').AsString) + '''');
|
sql.Add('where subid=''' + Trim(Order_Main.fieldbyname('subid').AsString) + '''');
|
||||||
sql.Add('UPDATE A SET A.MJLen = A.MJQty4 * B.kmxs ');
|
// sql.Add('UPDATE A SET A.MJLen = round(A.MJQty4 * B.kmxs,''' + trim(Fxsws) + ''') ');
|
||||||
|
sql.Add('UPDATE A SET A.MJLen = round(A.MJQty4 * B.kmxs, ' + IntToStr(Fxsws) + ')');
|
||||||
sql.Add('FROM WFB_MJJY A JOIN JYOrder_Sub B ON A.subid = B.subid');
|
sql.Add('FROM WFB_MJJY A JOIN JYOrder_Sub B ON A.subid = B.subid');
|
||||||
sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
|
sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
|
||||||
// ShowMessage(SQL.Text);
|
// ShowMessage(SQL.Text);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user