diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm index 08b3b9c..8812fe1 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm @@ -21,8 +21,8 @@ object frmMarkingInspection: TfrmMarkingInspection object cxGrid3: TcxGrid Left = 911 Top = 89 - Width = 455 - Height = 667 + Width = 463 + Height = 675 Align = alClient TabOrder = 4 object Tv3: TcxGridDBTableView @@ -119,7 +119,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 0 Top = 89 Width = 405 - Height = 667 + Height = 675 Align = alLeft TabOrder = 1 object SpeedButton13: TSpeedButton @@ -478,7 +478,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 405 Top = 89 Width = 212 - Height = 667 + Height = 675 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -513,7 +513,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label5: TLabel Left = 19 Top = 104 - Width = 40 + Width = 36 Height = 23 Caption = #38271#24230 Font.Charset = ANSI_CHARSET @@ -526,7 +526,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label11: TLabel Left = 19 Top = 386 - Width = 40 + Width = 36 Height = 23 Caption = #27611#37325 Font.Charset = ANSI_CHARSET @@ -539,7 +539,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label10: TLabel Left = 11 Top = 485 - Width = 40 + Width = 36 Height = 23 Caption = #27491#21697 Font.Charset = ANSI_CHARSET @@ -552,7 +552,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label12: TLabel Left = 118 Top = 485 - Width = 40 + Width = 36 Height = 22 Caption = #27425#21697 Font.Charset = ANSI_CHARSET @@ -565,7 +565,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label26: TLabel Left = 11 Top = 538 - Width = 40 + Width = 36 Height = 22 Caption = #20986#32440 Font.Charset = ANSI_CHARSET @@ -578,7 +578,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label30: TLabel Left = 19 Top = 292 - Width = 40 + Width = 36 Height = 23 Caption = #30382#37325 Font.Charset = ANSI_CHARSET @@ -604,7 +604,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label32: TLabel Left = 19 Top = 339 - Width = 40 + Width = 36 Height = 23 Caption = #20928#37325 Font.Charset = ANSI_CHARSET @@ -630,7 +630,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label34: TLabel Left = 118 Top = 538 - Width = 40 + Width = 36 Height = 22 Caption = #20221#25968 Font.Charset = ANSI_CHARSET @@ -643,7 +643,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label36: TLabel Left = 19 Top = 13 - Width = 40 + Width = 36 Height = 23 Caption = #21367#21495 Font.Charset = ANSI_CHARSET @@ -656,7 +656,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label37: TLabel Left = 19 Top = 58 - Width = 40 + Width = 36 Height = 23 Caption = #32568#21495 Font.Charset = ANSI_CHARSET @@ -669,7 +669,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label38: TLabel Left = 19 Top = 433 - Width = 40 + Width = 36 Height = 23 Caption = #31995#25968 Font.Charset = ANSI_CHARSET @@ -682,7 +682,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label6: TLabel Left = 19 Top = 245 - Width = 40 + Width = 36 Height = 23 Caption = #25918#30721 Font.Charset = ANSI_CHARSET @@ -695,7 +695,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label14: TLabel Left = 19 Top = 148 - Width = 40 + Width = 36 Height = 23 Caption = #38376#24133 Font.Charset = ANSI_CHARSET @@ -708,7 +708,7 @@ object frmMarkingInspection: TfrmMarkingInspection object Label16: TLabel Left = 19 Top = 196 - Width = 40 + Width = 36 Height = 23 Caption = #20811#37325 Font.Charset = ANSI_CHARSET @@ -1223,7 +1223,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 617 Top = 89 Width = 294 - Height = 667 + Height = 675 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1232,7 +1232,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 2 Top = 2 Width = 290 - Height = 379 + Height = 387 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -1331,7 +1331,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object AOrdDefNote1: TRichEdit Left = 2 - Top = 381 + Top = 389 Width = 290 Height = 284 Align = alBottom @@ -1348,14 +1348,14 @@ object frmMarkingInspection: TfrmMarkingInspection object Panel5: TPanel Left = 0 Top = 0 - Width = 1366 + Width = 1374 Height = 89 Align = alTop TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1364 + Width = 1372 Height = 57 Align = alClient BevelInner = bvRaised @@ -1513,7 +1513,7 @@ object frmMarkingInspection: TfrmMarkingInspection object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1364 + Width = 1372 Height = 30 ButtonHeight = 30 ButtonWidth = 119 diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas index 42eba83..d5c0993 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas @@ -507,7 +507,7 @@ begin sql.Add('inner join JYOrder_Main B on A.ORDMainIdRK=B.MainId'); sql.Add('inner join JYOrder_Sub C on A.ORDSubIdRK=C.SubId'); sql.Add('where SPID=''' + Trim(APID.Text) + ''''); - + Open; end; if ADOTmp.IsEmpty = False then @@ -1117,6 +1117,7 @@ var mvalue: Double; i: Integer; begin + BTPrint.Enabled := False; Panel6.SetFocus; if CheckData('Ìá½»') = False then exit; @@ -1134,7 +1135,10 @@ begin if not ADOTmp.IsEmpty then begin if Application.MessageBox('µ±Ç°¾íºÅÒÑ´æÔÚ£¬ÊÇ·ñ¼ÌÐø±£´æ£¿', 'Ìáʾ', 32 + 4) <> IDYES then + begin + BTPrint.Enabled := True; Exit; + end; end; end; @@ -1159,6 +1163,7 @@ begin FFFMJID := ''; InitCDGridID(); InitCDGrid(); + BTPrint.Enabled := True; // if FYXJL = 'Ã×Êý' then // begin // MJLen.SetFocus; @@ -1192,6 +1197,7 @@ begin if ADOQueryPrint.IsEmpty then begin application.MessageBox('±êÇ©ÄÚÈÝδÕÒµ½£¡', 'ÌáʾÐÅÏ¢', MB_ICONERROR); + BTPrint.Enabled := True; exit; end; try @@ -1207,6 +1213,7 @@ begin Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3); except application.MessageBox('ÌõÐÎÂëÉú³Éʧ°Ü£¡', 'ÌáʾÐÅÏ¢', MB_ICONERROR); + BTPrint.Enabled := True; exit; end; ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('LBName').AsString) + '.rmf', ADOTmp); @@ -1230,6 +1237,7 @@ begin else begin Application.MessageBox(PChar('ûÓÐÕÒ' + fPrintFile), 'Ìáʾ', 0); + BTPrint.Enabled := True; end; end;