diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index 0481d45..fd4d97b 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -136,6 +136,3 @@ ProductVersion=1.0.0.0 Comments= [Excluded Packages] c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/检验管理/U_GetDllForm.pas b/检验管理/U_GetDllForm.pas index 51d8317..d4777b2 100644 --- a/检验管理/U_GetDllForm.pas +++ b/检验管理/U_GetDllForm.pas @@ -78,7 +78,7 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; if trim(DataBaseStr) <> '' then DConString := DataBaseStr; -// DParameters1:='Ȩ'; + DParameters1:='Ȩ'; // DCode:='002'; // DName:='ADMIN'; // DParameters2:='Ʒ'; //12 diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index 70dbb1f..429e6fc 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -1,8 +1,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 477 - Top = 290 - Width = 1265 - Height = 738 + Left = 207 + Top = 42 + Width = 1253 + Height = 751 Caption = #25104#21697#26816#39564 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 101 Width = 237 - Height = 598 + Height = 619 Align = alLeft TabOrder = 1 object Tv3: TcxGridDBTableView @@ -127,8 +127,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 645 Top = 101 - Width = 604 - Height = 598 + Width = 600 + Height = 619 Align = alClient TabOrder = 4 object SpeedButton13: TSpeedButton @@ -977,7 +977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 445 Top = 101 Width = 200 - Height = 598 + Height = 619 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1801,7 +1801,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel4: TPanel Left = 0 Top = 0 - Width = 1249 + Width = 1245 Height = 101 Align = alTop BevelInner = bvRaised @@ -1810,14 +1810,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel5: TPanel Left = 2 Top = 2 - Width = 1245 + Width = 1241 Height = 97 Align = alClient TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1243 + Width = 1239 Height = 78 Align = alTop BevelInner = bvRaised @@ -2026,7 +2026,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnKeyPress = APIDKeyPress end object BTAdd: TButton - Left = 1211 + Left = 1139 Top = 8 Width = 46 Height = 25 @@ -2042,7 +2042,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = BTAddClick end object BTEdit: TButton - Left = 1160 + Left = 1088 Top = 8 Width = 33 Height = 25 @@ -2208,7 +2208,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1243 + Width = 1239 Height = 30 ButtonHeight = 30 ButtonWidth = 107 @@ -2534,7 +2534,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 237 Top = 101 Width = 208 - Height = 598 + Height = 619 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2543,7 +2543,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 204 - Height = 272 + Height = 293 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2652,7 +2652,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 274 + Top = 295 Width = 204 Height = 29 Align = alBottom @@ -2667,7 +2667,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 303 + Top = 324 Width = 204 Height = 293 Align = alBottom diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 76ec486..9c4f38d 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -689,7 +689,7 @@ begin OpenCom(DllName); if trim(JCYDLL) <> '' then OpenCom(JCYDLL); - Edit7.Visible := true; + Edit7.Visible := true; Label35.Visible := true; Edit9.Visible := true; Label44.Visible := true; @@ -2148,7 +2148,7 @@ begin begin if (strtofloatdef(trim(kmxs.Text), 0) <> 0) and (strtofloatdef(trim(mjQty4.Text), 0) <> 0) then begin - MJLen.Text := format('%.' + trim(fxsws) + 'f', [strtofloatdef(trim(mjQty4.Text), 0) * strtofloatdef(trim(kmxs.Text), 0)]) + MJLen.Text := format('%.' + trim(fxsws) + 'f', [(strtofloatdef(trim(mjQty4.Text), 0) + FJZ) * strtofloatdef(trim(kmxs.Text), 0)]) end; end; @@ -2182,7 +2182,7 @@ begin begin if (strtofloatdef(trim(kmxs.Text), 0) <> 0) and (strtofloatdef(trim(MJMaoZ.Text), 0) <> 0) then begin - MJLen.Text := format('%.' + trim(fxsws) + 'f', [(strtofloatdef(trim(MJMaoZ.Text), 0)) * strtofloatdef(trim(kmxs.Text), 0)]) + MJLen.Text := format('%.' + trim(fxsws) + 'f', [((strtofloatdef(trim(MJMaoZ.Text), 0)) + fjz) * strtofloatdef(trim(kmxs.Text), 0)]) end; end; end;