~
This commit is contained in:
DESKTOP-E401PHE\Administrator
parent
c2e3c24040
commit
6f9ea3c730
|
|
@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
Left = 0
|
||||
Top = 0
|
||||
Width = 1384
|
||||
Height = 62
|
||||
Height = 92
|
||||
AutoSize = True
|
||||
ButtonHeight = 30
|
||||
ButtonWidth = 119
|
||||
|
|
@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
Top = 0
|
||||
Caption = #25209#37327#20462#25913#32568#21495
|
||||
ImageIndex = 54
|
||||
Wrap = True
|
||||
OnClick = ToolButton11Click
|
||||
end
|
||||
object TBDW: TToolButton
|
||||
Left = 608
|
||||
Top = 0
|
||||
Left = 0
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #20462#25913#25968#37327#21333#20301
|
||||
ImageIndex = 54
|
||||
OnClick = TBDWClick
|
||||
end
|
||||
object ToolButton4: TToolButton
|
||||
Left = 719
|
||||
Top = 0
|
||||
Left = 111
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25209#37327#35843#25972#31859#25968
|
||||
ImageIndex = 54
|
||||
OnClick = ToolButton4Click
|
||||
end
|
||||
object ToolButton13: TToolButton
|
||||
Left = 830
|
||||
Top = 0
|
||||
Left = 222
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25209#37327#20928#37325#36716#38271#24230
|
||||
ImageIndex = 54
|
||||
|
|
@ -129,16 +130,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
OnClick = ToolButton13Click
|
||||
end
|
||||
object ToolButton8: TToolButton
|
||||
Left = 953
|
||||
Top = 0
|
||||
Left = 345
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25209#37327#20462#25913#30382#37325
|
||||
ImageIndex = 54
|
||||
Wrap = True
|
||||
OnClick = ToolButton8Click
|
||||
end
|
||||
object ToolButton1: TToolButton
|
||||
Left = 0
|
||||
Left = 456
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25171#21360#26631#31614
|
||||
|
|
@ -146,7 +146,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
OnClick = ToolButton1Click
|
||||
end
|
||||
object TCPDB: TToolButton
|
||||
Left = 87
|
||||
Left = 543
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25104#21697#25171#21253
|
||||
|
|
@ -155,7 +155,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
OnClick = TCPDBClick
|
||||
end
|
||||
object ToolButton3: TToolButton
|
||||
Left = 174
|
||||
Left = 630
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25171#21360#21253#26631#31614
|
||||
|
|
@ -164,24 +164,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
OnClick = ToolButton3Click
|
||||
end
|
||||
object ToolButton2: TToolButton
|
||||
Left = 273
|
||||
Left = 729
|
||||
Top = 30
|
||||
AutoSize = True
|
||||
Caption = #25171#21360#26816#39564#25253#21578
|
||||
ImageIndex = 12
|
||||
Wrap = True
|
||||
OnClick = ToolButton2Click
|
||||
end
|
||||
object ToolButton5: TToolButton
|
||||
Left = 384
|
||||
Top = 30
|
||||
Left = 0
|
||||
Top = 60
|
||||
AutoSize = True
|
||||
Caption = #25171#21360
|
||||
ImageIndex = 12
|
||||
OnClick = ToolButton5Click
|
||||
end
|
||||
object Edit3: TEdit
|
||||
Left = 447
|
||||
Top = 30
|
||||
Left = 63
|
||||
Top = 60
|
||||
Width = 68
|
||||
Height = 30
|
||||
Font.Charset = GB2312_CHARSET
|
||||
|
|
@ -195,8 +196,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
OnKeyPress = Edit3KeyPress
|
||||
end
|
||||
object ComboBox1: TComboBox
|
||||
Left = 515
|
||||
Top = 33
|
||||
Left = 131
|
||||
Top = 63
|
||||
Width = 149
|
||||
Height = 24
|
||||
Style = csDropDownList
|
||||
|
|
@ -220,8 +221,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
#26816#39564#30721#21333)
|
||||
end
|
||||
object Edit4: TEdit
|
||||
Left = 664
|
||||
Top = 30
|
||||
Left = 280
|
||||
Top = 60
|
||||
Width = 121
|
||||
Height = 30
|
||||
Font.Charset = GB2312_CHARSET
|
||||
|
|
@ -234,32 +235,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
Visible = False
|
||||
end
|
||||
object ToolButton12: TToolButton
|
||||
Left = 785
|
||||
Top = 30
|
||||
Left = 401
|
||||
Top = 60
|
||||
Caption = #20462#25913#30721#21333
|
||||
ImageIndex = 54
|
||||
Visible = False
|
||||
OnClick = ToolButton12Click
|
||||
end
|
||||
object ToolButton9: TToolButton
|
||||
Left = 904
|
||||
Top = 30
|
||||
Left = 520
|
||||
Top = 60
|
||||
AutoSize = True
|
||||
Caption = #24322#24120#25968#25454
|
||||
ImageIndex = 2
|
||||
OnClick = ToolButton9Click
|
||||
end
|
||||
object TBExport: TToolButton
|
||||
Left = 991
|
||||
Top = 30
|
||||
Left = 607
|
||||
Top = 60
|
||||
AutoSize = True
|
||||
Caption = #23548#20986
|
||||
ImageIndex = 75
|
||||
OnClick = TBExportClick
|
||||
end
|
||||
object TBClose: TToolButton
|
||||
Left = 1054
|
||||
Top = 30
|
||||
Left = 670
|
||||
Top = 60
|
||||
AutoSize = True
|
||||
Caption = #20851#38381
|
||||
ImageIndex = 55
|
||||
|
|
@ -268,7 +269,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
end
|
||||
object Panel1: TPanel
|
||||
Left = 0
|
||||
Top = 62
|
||||
Top = 92
|
||||
Width = 1384
|
||||
Height = 88
|
||||
Align = alTop
|
||||
|
|
@ -783,9 +784,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
|||
end
|
||||
object cxGrid1: TcxGrid
|
||||
Left = 0
|
||||
Top = 150
|
||||
Top = 180
|
||||
Width = 1384
|
||||
Height = 568
|
||||
Height = 538
|
||||
Align = alClient
|
||||
PopupMenu = PopupMenu1
|
||||
TabOrder = 3
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
cxCurrencyEdit, MMSystem, 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)
|
||||
|
|
@ -1130,22 +1143,27 @@ begin
|
|||
with ADOQueryPrint do
|
||||
begin
|
||||
Close;
|
||||
SQL.Clear;
|
||||
sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,');
|
||||
SQL.Clear;
|
||||
sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,C.JS,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,');
|
||||
sql.add('bjs=(select count(*) from WFB_MJJY X where x.mainid=A.mainid and X.subid=A.Subid and X.baono=A.baono),');
|
||||
sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),');
|
||||
sql.Add('PRTMF=DBO.F_Get_Order_SubStr(BaoID,''BNPRTMF''),PRTkz=DBO.F_Get_Order_SubStr(BaoID,''BNPRTkz''),');
|
||||
sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), ');
|
||||
sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), ');
|
||||
sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
|
||||
sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
|
||||
sql.Add('Sorddefstr5=DBO.F_Get_Order_SubStr(BaoID,''BNSorddefstr5''),');
|
||||
sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
|
||||
sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
|
||||
sql.Add('PRTSpec=DBO.F_Get_Order_SubStr(BaoID,''BNPRTSpec''),');
|
||||
sql.Add('KHOrderNo=DBO.F_Get_Order_SubStr(BaoID,''BNKhOrderNo''),');
|
||||
sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), ');
|
||||
sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), ');
|
||||
SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen');
|
||||
sql.Add('from WFB_MJJY A');
|
||||
sql.Add(' inner join JYOrder_Sub C on C.SubID=A.SubID');
|
||||
sql.Add(' inner join JYOrder_Main D on D.MainID=A.MainID');
|
||||
sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID');
|
||||
sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID');
|
||||
SQL.Add(' where A.BaoID=''' + Trim(Order_Main.fieldbyname('BaoID').AsString) + '''');
|
||||
SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName');
|
||||
SQL.ADD('group by A.mainid,A.subid,A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,C.JS,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName');
|
||||
Open;
|
||||
end;
|
||||
if Trim(ADOQueryPrint.fieldbyname('NLBName').AsString) <> '' then
|
||||
|
|
@ -1502,16 +1520,16 @@ begin
|
|||
ExecSQL;
|
||||
end;
|
||||
|
||||
if (trim(ComboBox1.Text) = '¼ìÑéÂëµ¥(Ó¢ÎÄ)') then
|
||||
if (trim(ComboBox1.Text) = '¼ìÑéÂëµ¥(Ó¢ÎÄ)') then
|
||||
begin
|
||||
with ADOQueryTemp do
|
||||
begin
|
||||
Close;
|
||||
sql.Clear;
|
||||
sql.add('exec P_Print_CKMDHAEIL ');
|
||||
sql.add('@DName=' + quotedstr(Trim(DCode)));
|
||||
sql.add('@DName=' + quotedstr(Trim(DCode)));
|
||||
Open;
|
||||
end;
|
||||
end;
|
||||
SCreateCDS20(ADOQueryTemp, CDS_HZ);
|
||||
SInitCDSData20(ADOQueryTemp, CDS_HZ);
|
||||
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ begin
|
|||
// SQL.Add('where A.BaoID=''' + Trim(FBaoid) + '''');
|
||||
// SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,C.Sorddefstr5');
|
||||
// Open;
|
||||
// end;
|
||||
// end;
|
||||
with ADOQueryPrint do
|
||||
begin
|
||||
Close;
|
||||
|
|
@ -419,6 +419,7 @@ begin
|
|||
sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,C.JS,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,');
|
||||
sql.add('bjs=(select count(*) from WFB_MJJY X where x.mainid=A.mainid and X.subid=A.Subid and X.baono=A.baono),');
|
||||
sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),');
|
||||
sql.Add('PRTMF=DBO.F_Get_Order_SubStr(BaoID,''BNPRTMF''),PRTkz=DBO.F_Get_Order_SubStr(BaoID,''BNPRTkz''),');
|
||||
sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), ');
|
||||
sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), ');
|
||||
sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user