Group_99/D7DJxiongshan
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-09-29 09:30:48 +08:00
parent b3618ba9db
commit 2ff5b74bb8
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
复合检验管理/U_OrderInPut.pas
View File

@ -399,11 +399,13 @@ begin
if PState = 1 then if PState = 1 then
begin begin
sql.Add(' and MainId=''' + Trim(FMainId) + ''''); sql.Add(' and MainId=''' + Trim(FMainId) + '''');
sql.Add('order by XHNo')
end; end;
if PState = 0 then if PState = 0 then
begin begin
sql.Add(' and 1<>1'); sql.Add(' and 1<>1');
end; end;
Open; Open;
end; end;
SCreateCDS20(ADOQuery1, Order_Sub); SCreateCDS20(ADOQuery1, Order_Sub);

19
复合检验管理/U_ProductOrderNewList.pas
View File

@ -20,12 +20,12 @@ uses
dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; dxSkinscxPCPainter;
type type
TfrmProductOrderNewList = class(TForm) TfrmProductOrderNewList = class(TForm)
@ -290,7 +290,7 @@ begin
SQL.Add('MaxRoll=(select isnull(sum(maxroll),0) from (select Subid,mjstr4,max(mjxh) as maxroll from wfb_mjjy X group by mjstr4,Subid) XX where XX.subid=A.subid)'); SQL.Add('MaxRoll=(select isnull(sum(maxroll),0) from (select Subid,mjstr4,max(mjxh) as maxroll from wfb_mjjy X group by mjstr4,Subid) XX where XX.subid=A.subid)');
sql.Add('from JYOrder_sub A '); sql.Add('from JYOrder_sub A ');
sql.Add('where A.mainID =' + quotedstr((Order_Main.fieldbyname('mainID').AsString))); sql.Add('where A.mainID =' + quotedstr((Order_Main.fieldbyname('mainID').AsString)));
sql.Add(')AA'); sql.Add(')AA order by XHNo');
open; open;
end; end;
end; end;
@ -859,7 +859,8 @@ begin
sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid '); sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid ');
// sql.Add(' left join TP_File D on D.TFID=A.orderNO '); // sql.Add(' left join TP_File D on D.TFID=A.orderNO ');
sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID '); sql.Add(' order by cast(B.xhno as int) ');
// sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
Open; Open;
end; end;
@ -869,7 +870,7 @@ begin
begin begin
RM1.LoadFromFile(fPrintFile); RM1.LoadFromFile(fPrintFile);
RM1.ShowReport; RM1.ShowReport;
RMDBMain.DataSet :=nil; RMDBMain.DataSet := nil;
end end
else else
begin begin