diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index 32cab34..3fa42c4 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_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index ab9ab97..ee62ae6 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1384 + Width = 1392 Height = 92 AutoSize = True ButtonHeight = 30 @@ -285,7 +285,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 92 - Width = 1384 + Width = 1392 Height = 88 Align = alTop BevelInner = bvRaised @@ -801,8 +801,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 180 - Width = 1384 - Height = 538 + Width = 1392 + Height = 546 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 1b709c5..7bb1540 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -1808,7 +1808,7 @@ begin Post; Next; - end + end else Next; end; @@ -2415,7 +2415,7 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd30_Bbq19 '); + sql.add('exec P_Do_PrintMd30_ban_copy1 '); sql.add('@banid=''' + Trim(Order_Main.fieldbyname('banid').AsString) + ''' '); Open; end; @@ -2426,7 +2426,7 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd30_Bbq19 '); + sql.add('exec P_Do_PrintMd30_ban_copy1 '); sql.add('@banid=''' + Trim(Order_Main.fieldbyname('banid').AsString) + ''' '); // ShowMessage(SQL.text); Open; diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 4b5cc3e..4e0a27b 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -1,6 +1,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 296 - Top = 147 + Left = 274 + Top = 227 Width = 1366 Height = 824 Caption = #25104#21697#26816#39564 @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 87 Width = 214 - Height = 698 + Height = 706 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -125,8 +125,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 633 Top = 87 - Width = 717 - Height = 698 + Width = 725 + Height = 706 Align = alClient Color = clWhite ParentColor = False @@ -977,7 +977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 394 Top = 87 Width = 239 - Height = 698 + Height = 706 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2091,7 +2091,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 214 Top = 87 Width = 180 - Height = 698 + Height = 706 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2100,7 +2100,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 176 - Height = 377 + Height = 385 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2208,7 +2208,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 379 + Top = 387 Width = 176 Height = 28 Align = alBottom @@ -2223,7 +2223,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 648 + Top = 656 Width = 176 Height = 48 Align = alBottom @@ -2239,7 +2239,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel5: TPanel Left = 2 - Top = 407 + Top = 415 Width = 176 Height = 241 Align = alBottom @@ -2515,7 +2515,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1350 + Width = 1358 Height = 30 AutoSize = True ButtonHeight = 30 @@ -2688,7 +2688,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel6: TPanel Left = 0 Top = 30 - Width = 1350 + Width = 1358 Height = 57 Align = alTop BevelInner = bvRaised @@ -3116,8 +3116,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object Panel1: TPanel - Left = 168 - Top = 132 + Left = 200 + Top = 196 Width = 641 Height = 209 Color = clSkyBlue @@ -3170,8 +3170,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object Panel4: TPanel - Left = 200 - Top = 172 + Left = 216 + Top = 252 Width = 641 Height = 209 Color = clSkyBlue diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index 4a62383..1bc5833 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -3813,9 +3813,9 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd30_copy1 '); + sql.add('exec P_Do_PrintMd30_ban '); sql.add('@DName=' + quotedstr(Trim(DCode))); - SQL.Add(',@JTType=' + QuotedStr(SCXFlag)); + //SQL.Add(',@JTType=' + QuotedStr(SCXFlag)); // ShowMessage(SQL.text); sql.add('update WFB_MJJY set banflag= 1 from WFB_MJJY A '); SQL.Add(' where A.banno=''' + trim(Banno.Text) + ''' and A.mainID=''' + trim(fMainID) + '''');