~
This commit is contained in:
parent
427f1243db
commit
08be937f66
|
@ -4,7 +4,21 @@ interface
|
|||
|
||||
uses
|
||||
SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
|
||||
Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs;
|
||||
Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs,
|
||||
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;
|
||||
type
|
||||
TMyThread = class(TThread)
|
||||
protected
|
||||
|
|
|
@ -1623,7 +1623,8 @@ begin
|
|||
Open;
|
||||
end;
|
||||
end;
|
||||
if (trim(ComboBox1.Text) = '쇱駱쯤데관뵀') then
|
||||
if (trim(ComboBox1.Text) = '쇱駱쯤데관뵀') or (trim(ComboBox1.Text) = '쇱駱쯤데(관뵀<EAB480>뵀)')
|
||||
or (trim(ComboBox1.Text) = '쇱駱쯤데(관뵀낀똑)') or (trim(ComboBox1.Text) = '쇱駱쯤데(관뵀낀똑)') then
|
||||
begin
|
||||
with ADOQueryTemp do
|
||||
begin
|
||||
|
@ -1647,7 +1648,8 @@ begin
|
|||
Open;
|
||||
end;
|
||||
end;
|
||||
if (trim(ComboBox1.Text) = '쇱駱쯤데') or (trim(ComboBox1.Text) = '쇱駱쯤데(낀똑)') or (trim(ComboBox1.Text) = '쇱駱쯤데(路좆)') then
|
||||
if (trim(ComboBox1.Text) = '쇱駱쯤데') or (trim(ComboBox1.Text) = '쇱駱쯤데(낀똑)')
|
||||
or (trim(ComboBox1.Text) = '쇱駱쯤데(路좆)') then
|
||||
begin
|
||||
with ADOQueryTemp do
|
||||
begin
|
||||
|
|
|
@ -392,6 +392,7 @@ begin
|
|||
sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
|
||||
sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
|
||||
sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
|
||||
sql.Add('PRTcodename=DBO.F_Get_Order_SubStr(BaoID,''BNPRTcodename''),Sorddefstr5=DBO.F_Get_Order_SubStr(BaoID,''BNPSorddefstr5''),');
|
||||
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');
|
||||
|
@ -2853,6 +2854,7 @@ begin
|
|||
sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
|
||||
sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
|
||||
sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
|
||||
sql.Add('PRTcodename=DBO.F_Get_Order_SubStr(BaoID,''BNPRTcodename''),Sorddefstr5=DBO.F_Get_Order_SubStr(BaoID,''BNPSorddefstr5''),');
|
||||
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');
|
||||
|
|
Loading…
Reference in New Issue
Block a user