From f31462034d073668fe7504cc884ef27ec901c778 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 1 Nov 2025 13:51:15 +0800 Subject: [PATCH] 1 --- 检验管理/U_GetDllForm.pas | 2 +- 检验管理/U_JYOrderCDOne.dfm | 19 ++++++++----- 检验管理/U_JYOrderCDOne.pas | 48 ++++++++++++++++++++++++++++++--- 检验管理/U_MJManageNewFDNew.dfm | 24 ++++++++--------- 检验管理/U_MJManageNewFDNew.pas | 41 ++++++++++++++++++++++++++-- 5 files changed, 109 insertions(+), 25 deletions(-) diff --git a/检验管理/U_GetDllForm.pas b/检验管理/U_GetDllForm.pas index 24d840a..88bbe1f 100644 --- a/检验管理/U_GetDllForm.pas +++ b/检验管理/U_GetDllForm.pas @@ -84,7 +84,7 @@ begin //DCode:='ADMIN'; //DName:='ADMIN'; // DParameters2:='Ʒ'; -// DParameters2:=''; + DParameters2:=''; if not ConnData() then begin result := 0; diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 0f1d581..3c897dd 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 357 - Top = 158 + Left = 365 + Top = 313 Width = 1382 Height = 754 Caption = #26816#39564#25253#21578 @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 Height = 62 AutoSize = True ButtonHeight = 30 @@ -246,7 +246,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1366 + Width = 1374 Height = 88 Align = alTop BevelInner = bvRaised @@ -767,8 +767,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1366 - Height = 565 + Width = 1374 + Height = 573 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -776,6 +776,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> OnCellDblClick = Tv1CellDblClick + OnCustomDrawCell = Tv1CustomDrawCell DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Summary.DefaultGroupSummaryItems = <> @@ -1084,6 +1085,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column4: TcxGridDBColumn + Caption = #30133#28857 + DataBinding.FieldName = 'CDName' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index c468e2f..c0d89e1 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -212,6 +212,7 @@ type ComboBox3: TComboBox; Button8: TButton; Button10: TButton; + Tv1Column4: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -267,6 +268,7 @@ type procedure Button4Click(Sender: TObject); procedure Button10Click(Sender: TObject); procedure Button8Click(Sender: TObject); + procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); private DQdate: TDateTime; FLeft, FTop: Integer; @@ -374,7 +376,8 @@ begin sql.Add('select A.*,'); sql.Add('C.OrderNo,C.conNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); - sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); + sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID),'); + sql.Add('CDName=(select CDName from WFB_MJJY_CD X where X.MJID=A.MJID)'); SQL.Add('from WFB_MJJY A'); sql.Add('inner join JYOrder_sub B on B.subID=A.subID '); sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID '); @@ -1601,14 +1604,14 @@ begin sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; - end; - end; + end; + end; if (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥') then begin with ADOQueryTemp do begin - Close; + Close; sql.Clear; sql.add('exec P_Print_CKMD_copy3 '); sql.add('@mainID=' + quotedstr(Trim(''))); @@ -2300,5 +2303,42 @@ begin Panel12.Visible := false; end; +procedure TfrmJYOrderCDOne.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +var + CDName: string; +begin + CDName := VarToStr(AViewInfo.GridRecord.Values[AViewInfo.Item.Index]); + if CDName = 'ᵵ' then + begin + ACanvas.Brush.Color := clRed; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clYellow; + ACanvas.Font.Color := clBlack; + end + else if CDName = 'ɫ' then + begin + ACanvas.Brush.Color := clBlue; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clGreen; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clPurple; + ACanvas.Font.Color := clBlack; + end + else if CDName = '©˿' then + begin + ACanvas.Brush.Color := RGB(255, 192, 203); + ACanvas.Font.Color := clBlack; + end; +end; + end. diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index ed7d0ad..f7660bb 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -1,6 +1,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 301 - Top = 406 + Left = 646 + Top = 314 Width = 1545 Height = 738 Caption = #25104#21697#26816#39564 @@ -186,9 +186,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object ScrollBox1: TScrollBox - Left = 793 + Left = 1001 Top = 87 - Width = 744 + Width = 536 Height = 620 Align = alClient Color = clWhite @@ -1805,7 +1805,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object MovePanel1: TMovePanel - Left = 797 + Left = 1021 Top = 91 Width = 351 Height = 238 @@ -2057,23 +2057,23 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel7: TPanel Left = 750 Top = 87 - Width = 43 + Width = 251 Height = 620 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - Visible = False object cxGrid2: TcxGrid Left = 2 Top = 2 - Width = 39 + Width = 247 Height = 295 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> OnCellDblClick = Tv2CellDblClick + OnCustomDrawCell = Tv2CustomDrawCell DataController.DataSource = DataSource2 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -2177,7 +2177,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel8: TPanel Left = 2 Top = 297 - Width = 39 + Width = 247 Height = 28 Align = alBottom Font.Charset = GB2312_CHARSET @@ -2192,7 +2192,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object AOrdDefNote1: TRichEdit Left = 2 Top = 325 - Width = 39 + Width = 247 Height = 293 Align = alBottom Font.Charset = GB2312_CHARSET @@ -2207,8 +2207,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object Panel3: TPanel - Left = 754 - Top = 380 + Left = 1042 + Top = 356 Width = 303 Height = 293 BevelInner = bvRaised diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 7ebf361..e2036bf 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -329,6 +329,7 @@ type procedure baoNoExit(Sender: TObject); procedure FormCreate(Sender: TObject); procedure Edit13Click(Sender: TObject); + procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); // procedure Panel3MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); private { Private declarations } @@ -2543,7 +2544,6 @@ begin fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString); fOrderUnit := uppercase(Trim(ADOTmp.fieldbyname('OrderUnit').AsString)); - if fOrderUnit = 'Y' then begin Label9.Caption := 'Y'; @@ -2553,7 +2553,7 @@ begin Label9.Caption := 'M' end; //Label9.Caption := fOrderUnit; - + if FDC <> 0 then begin Edit12.Visible := True; @@ -3135,5 +3135,42 @@ end; // //end; +procedure TfrmMJManageNewFDNewSF.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +var + CDName: string; +begin + CDName := VarToStr(AViewInfo.GridRecord.Values[AViewInfo.Item.Index]); + if CDName = 'ᵵ' then + begin + ACanvas.Brush.Color := clRed; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clYellow; + ACanvas.Font.Color := clBlack; + end + else if CDName = 'ɫ' then + begin + ACanvas.Brush.Color := clBlue; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clGreen; + ACanvas.Font.Color := clBlack; + end + else if CDName = '' then + begin + ACanvas.Brush.Color := clPurple; + ACanvas.Font.Color := clBlack; + end + else if CDName = '©˿' then + begin + ACanvas.Brush.Color := RGB(255, 192, 203); + ACanvas.Font.Color := clBlack; + end; +end; + end.