diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 71f5964..55a0b84 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1374 + Width = 1366 Height = 62 AutoSize = True ButtonHeight = 30 @@ -188,7 +188,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ComboBox1: TComboBox Left = 535 - Top = 30 + Top = 33 Width = 149 Height = 24 Style = csDropDownList @@ -198,8 +198,10 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [] ItemHeight = 16 + ItemIndex = 0 ParentFont = False TabOrder = 0 + Text = #26816#39564#30721#21333 OnChange = ComboBox1Change Items.Strings = ( #26816#39564#30721#21333 @@ -211,7 +213,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #28151#33394#21253#30721#21333'2' #22825#28193#30721#21333 #28151#33394#21253#30721#21333#20004#20301 - '' + #28151#33457#22411#21253#30721#21333 '') end object ToolButton9: TToolButton @@ -242,7 +244,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1374 + Width = 1366 Height = 88 Align = alTop BevelInner = bvRaised @@ -763,8 +765,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1374 - Height = 573 + Width = 1366 + Height = 565 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 30a3cb7..1895e6d 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -542,7 +542,7 @@ begin TBPZ.Visible := false; // TCPDB.Visible:=False; end; - ComboBox1.ItemIndex:=0; + ComboBox1.ItemIndex := 0; end; procedure TfrmJYOrderCDOne.Panel10MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); @@ -1510,9 +1510,9 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd_tiandu '); + sql.add('exec P_Do_PrintMd_tiandu '); sql.add('@mainID=' + quotedstr(Trim(''))); - sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); Open; end; SCreateCDS20(ADOQueryTemp, CDS_HZ); @@ -1554,8 +1554,33 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = '컨Ͱ뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_HSDB_HX '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); - if (trim(ComboBox1.Text) = 'ɫ뵥λ') then + with ADOQueryPrint do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''12'' '); + Open; + end; + end; + + if (trim(ComboBox1.Text) = 'ɫ뵥λ') then begin with ADOQueryTemp do begin