This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-10-21 09:34:50 +08:00
parent c4a251ad82
commit 30798189fb

View File

@ -473,7 +473,7 @@ begin
Exit; Exit;
end; end;
if FileExists(fPrintFile) then if FileExists(fPrintFile) then
begin begin
RMVariables['QRBARCODE'] := fImagePath; RMVariables['QRBARCODE'] := fImagePath;
RM2.LoadFromFile(fPrintFile); RM2.LoadFromFile(fPrintFile);
@ -926,7 +926,7 @@ var
maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string; maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string;
FMJLen: Double; FMJLen: Double;
FOrder: Integer; FOrder: Integer;
begin begin
result := false; result := false;
if PState = 1 then if PState = 1 then
@ -1304,7 +1304,7 @@ begin
Close; Close;
SQL.Clear; SQL.Clear;
sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A '); sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A ');
sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + ''''); sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and A.subid=''' + Trim(FsubId) + ''' and isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
sql.Add(' order by MJXH Desc'); sql.Add(' order by MJXH Desc');
Open; Open;
end; end;
@ -1369,7 +1369,7 @@ begin
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + ''''); sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and X.subid=''' + Trim(Fsubid) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1'); sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1');
Open; Open;
end; end;