diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index 4a3b348..16e2376 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -1426,6 +1426,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Top = 381 Width = 90 Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1539,6 +1540,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Top = 415 Width = 90 Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index b3734e1..9f73840 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -694,11 +694,11 @@ var Th: Thandle; begin // closeCom(FComFile); - Th := LoadLibrary(Pchar(trim(DllNameT))); + Th := LoadLibrary(Pchar(trim(DllNameT))); if Th > 0 then begin try - Tp := GetProcAddress(Th, 'CommOpen'); + Tp := GetProcAddress(Th, 'CommOpen'); if Tp <> nil then begin Tf := TMyFunc(Tp); @@ -1235,6 +1235,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); + FieldByName('MJBZD').Value := StrToFloatdef(trim(MJBZD.Text), 0); FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; if Trim(MJFK.Text) <> '' then begin @@ -1244,7 +1245,7 @@ begin begin FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz + StrToFloatdef(trim(MJBZD.Text), 0); end; - if Trim(MJSJKZ.Text) <> '' then + if Trim(MJSJKZ.Text) <> '' then begin FieldByName('MJSJKZ').Value := MJSJKZ.Text; end; @@ -2921,6 +2922,7 @@ begin MJQty1.Text := Trim(ADOTmp.fieldbyname('MJQty1').AsString); MJQty2.Text := Trim(ADOTmp.fieldbyname('MJQty2').AsString); MJQty3.Text := Trim(ADOTmp.fieldbyname('MJQty3').AsString); + MJBZD.Text := Trim(ADOTmp.fieldbyname('MJBZD').AsString); MJQty4.Text := Trim(ADOTmp.fieldbyname('MJQty4').AsString); MJMaoZ.Text := Trim(ADOTmp.fieldbyname('MJMaoZ').AsString); Label15.Caption := Trim(CDS_MJID.fieldbyname('MJID').AsString);