This commit is contained in:
DESKTOP-E401PHE\Administrator 2026-01-04 15:01:39 +08:00
parent a15bec0e3b
commit c5eaa13b9b
3 changed files with 11 additions and 11 deletions

View File

@ -101,7 +101,7 @@ DebugSourceDirs=
UsePackages=0 UsePackages=0
[Parameters] [Parameters]
RunParams= RunParams=
HostApplication=D:\徐加艳项目代码\项目代码\柯福\复合检验管理\testDll.exe HostApplication=D:\Dp7Repo\项目代码\D7DJkefu\复合检验管理\testDll.exe
Launcher= Launcher=
UseLauncher=0 UseLauncher=0
DebugCWD= DebugCWD=

View File

@ -1,7 +1,7 @@
object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Left = 387 Left = 390
Top = 217 Top = 217
Width = 1368 Width = 1365
Height = 754 Height = 754
Caption = #25104#21697#26816#39564 Caption = #25104#21697#26816#39564
Color = clBtnFace Color = clBtnFace
@ -208,7 +208,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
object ScrollBox1: TScrollBox object ScrollBox1: TScrollBox
Left = 1151 Left = 1151
Top = 87 Top = 87
Width = 201 Width = 198
Height = 628 Height = 628
Align = alClient Align = alClient
Color = clWhite Color = clWhite
@ -2804,7 +2804,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1352 Width = 1349
Height = 30 Height = 30
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
@ -2977,7 +2977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
object Panel6: TPanel object Panel6: TPanel
Left = 0 Left = 0
Top = 30 Top = 30
Width = 1352 Width = 1349
Height = 57 Height = 57
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -3350,8 +3350,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
end end
end end
object ScrollBox2: TScrollBox object ScrollBox2: TScrollBox
Left = -404 Left = -500
Top = 472 Top = 536
Width = 653 Width = 653
Height = 457 Height = 457
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET

View File

@ -689,7 +689,7 @@ procedure TfrmMJManageNewFDNewSF.InitCDGridID();
begin begin
with ADOQueryMain do with ADOQueryMain do
begin begin
Close; Close;
SQL.Clear; SQL.Clear;
sql.Add('select '); sql.Add('select ');
//sql.Add('Case when isnull(MJType,'''')=''´ÎÆ·'' then ''B''+RTrim(Cast(MJXH as varchar(20))) else Cast(MJXH as varchar(20)) end as MJXH ,'); //sql.Add('Case when isnull(MJType,'''')=''´ÎÆ·'' then ''B''+RTrim(Cast(MJXH as varchar(20))) else Cast(MJXH as varchar(20)) end as MJXH ,');
@ -697,6 +697,7 @@ begin
if Trim(SCXFlag) <> '' then if Trim(SCXFlag) <> '' then
sql.Add(' and JTType=''' + Trim(SCXFlag) + ''''); sql.Add(' and JTType=''' + Trim(SCXFlag) + '''');
sql.Add('and mjstr2=''δÈë¿â'' '); sql.Add('and mjstr2=''δÈë¿â'' ');
sql.Add('and filltime>CONVERT(char(10),getdate()-7,23)');
sql.Add(' order by FillTime desc'); sql.Add(' order by FillTime desc');
Open; Open;
end; end;
@ -2642,7 +2643,6 @@ begin
// sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)'); // sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
sql.Add('maxBaoNO=case when B.baosx=''°´ÑÕÉ«Éú³É'' then 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID and X.subid=C.subID ),0)'); sql.Add('maxBaoNO=case when B.baosx=''°´ÑÕÉ«Éú³É'' then 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID and X.subid=C.subID ),0)');
sql.Add(' else 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID ),0) end '); sql.Add(' else 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID ),0) end ');
sql.Add('from JYOrder_Sub C'); sql.Add('from JYOrder_Sub C');
SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId '); SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
sql.Add('where C.SubID=''' + Trim(APID.Text) + ''''); sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
@ -3609,7 +3609,7 @@ begin
end; end;
end; end;
finally finally
frmSCPersonColor.close; frmSCPersonColor.close;
end; end;
end; end;