diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index e0faf75..36065cb 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\˿\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJalisi\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 0e32543..8fd842f 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -972,7 +972,7 @@ begin if Edit12.Text <> '' then begin FieldByName('DingMaFlag').Value := ''; - end; + end; if Edit10.Text <> '' then begin FieldByName('DaoXuFlag').Value := 'ŵ'; @@ -1016,7 +1016,7 @@ begin else begin if trim(fOrderUnit) <> 'KG' then - MFMJLen:= StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc + MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc else MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + fjc; @@ -2548,14 +2548,21 @@ begin fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString); fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString); fOrderUnit := uppercase(Trim(ADOTmp.fieldbyname('OrderUnit').AsString)); - + if fOrderUnit = 'Y' then + begin + Label9.Caption := 'Y'; + end + else + begin + Label9.Caption := 'M' + end; if FDC <> 0 then begin Edit12.Visible := True; Label51.Visible := True; Edit12.Text := ''; end - else + else begin Edit12.Visible := False; Label51.Visible := False;