打卷界面和检验信息界面，根据疵点情况，染行

2025-11-05 09:31:20 +08:00 · 2025-11-05 09:31:20 +08:00 · 7e6b2e19cf
commit 7e6b2e19cf
parent f31462034d
9 changed files with 201 additions and 141 deletions
--- a/检验管理/ProjectGroup1.bpg
+++ b/检验管理/ProjectGroup1.bpg
@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = TradeManage.dll testDll.exe
+PROJECTS = FinishedClothWarehouse.dll testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------

-TradeManage.dll: TradeManage.dpr
+FinishedClothWarehouse.dll: ..\..\..\..\项目代码\D7szChenfeng\成品仓库(FinishedClothWarehouse.dll)\FinishedClothWarehouse.dpr
  $(DCC)

-testDll.exe: testDll.dpr
+testDll.exe: ..\..\..\..\项目代码\D7szChenfeng\成品仓库(FinishedClothWarehouse.dll)\testDll.dpr
  $(DCC)


--- a/检验管理/ProjectGroup1.~bpg
+++ b/检验管理/ProjectGroup1.~bpg
@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe
 default: $(PROJECTS)
 #------------------------------------------------------------------------------

-TradeManage.dll: ..\..\D7DJwenyuan\打卷检验管理\TradeManage.dpr
+TradeManage.dll: TradeManage.dpr
  $(DCC)

-testDll.exe: ..\..\D7DJwenyuan\打卷检验管理\testDll.dpr
+testDll.exe: testDll.dpr
  $(DCC)


--- a/检验管理/TradeManage.skincfg
+++ b/检验管理/TradeManage.skincfg
@ -1,50 +1,50 @@
 [ExpressSkins]
 Default=1
 ShowNotifications=1
-Enabled=0
-dxSkinBlack=1
-dxSkinBlue=1
-dxSkinBlueprint=1
-dxSkinCaramel=1
-dxSkinCoffee=1
-dxSkinDarkRoom=1
-dxSkinDarkSide=1
-dxSkinDevExpressDarkStyle=1
-dxSkinDevExpressStyle=1
-dxSkinFoggy=1
-dxSkinGlassOceans=1
-dxSkinHighContrast=1
-dxSkiniMaginary=1
-dxSkinLilian=1
-dxSkinLiquidSky=1
-dxSkinLondonLiquidSky=1
-dxSkinMcSkin=1
-dxSkinMetropolis=1
-dxSkinMetropolisDark=1
-dxSkinMoneyTwins=1
-dxSkinOffice2007Black=1
-dxSkinOffice2007Blue=1
-dxSkinOffice2007Green=1
-dxSkinOffice2007Pink=1
-dxSkinOffice2007Silver=1
-dxSkinOffice2010Black=1
-dxSkinOffice2010Blue=1
-dxSkinOffice2010Silver=1
-dxSkinOffice2013DarkGray=1
-dxSkinOffice2013LightGray=1
-dxSkinOffice2013White=1
-dxSkinPumpkin=1
-dxSkinSeven=1
-dxSkinSevenClassic=1
-dxSkinSharp=1
-dxSkinSharpPlus=1
-dxSkinSilver=1
-dxSkinSpringTime=1
-dxSkinStardust=1
-dxSkinSummer2008=1
-dxSkinTheAsphaltWorld=1
+Enabled=1
+dxSkinBlack=0
+dxSkinBlue=0
+dxSkinBlueprint=0
+dxSkinCaramel=0
+dxSkinCoffee=0
+dxSkinDarkRoom=0
+dxSkinDarkSide=0
+dxSkinDevExpressDarkStyle=0
+dxSkinDevExpressStyle=0
+dxSkinFoggy=0
+dxSkinGlassOceans=0
+dxSkinHighContrast=0
+dxSkiniMaginary=0
+dxSkinLilian=0
+dxSkinLiquidSky=0
+dxSkinLondonLiquidSky=0
+dxSkinMcSkin=0
+dxSkinMetropolis=0
+dxSkinMetropolisDark=0
+dxSkinMoneyTwins=0
+dxSkinOffice2007Black=0
+dxSkinOffice2007Blue=0
+dxSkinOffice2007Green=0
+dxSkinOffice2007Pink=0
+dxSkinOffice2007Silver=0
+dxSkinOffice2010Black=0
+dxSkinOffice2010Blue=0
+dxSkinOffice2010Silver=0
+dxSkinOffice2013DarkGray=0
+dxSkinOffice2013LightGray=0
+dxSkinOffice2013White=0
+dxSkinPumpkin=0
+dxSkinSeven=0
+dxSkinSevenClassic=0
+dxSkinSharp=0
+dxSkinSharpPlus=0
+dxSkinSilver=0
+dxSkinSpringTime=0
+dxSkinStardust=0
+dxSkinSummer2008=0
+dxSkinTheAsphaltWorld=0
 dxSkinsDefaultPainters=1
-dxSkinValentine=1
-dxSkinVS2010=1
-dxSkinWhiteprint=1
-dxSkinXmas2008Blue=1
+dxSkinValentine=0
+dxSkinVS2010=0
+dxSkinWhiteprint=0
+dxSkinXmas2008Blue=0
--- a/检验管理/U_ClothHCList.dfm
+++ b/检验管理/U_ClothHCList.dfm
@ -1,6 +1,6 @@
 object frmClothHCList: TfrmClothHCList
-  Left = 623
-  Top = 453
+  Left = 592
+  Top = 204
  Width = 1179
  Height = 705
  Caption = #26816#39564#25351#31034#21333#26597#35810
--- a/检验管理/U_ClothHCList.pas
+++ b/检验管理/U_ClothHCList.pas
@ -11,7 +11,8 @@ uses
  cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter,
  RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport,
  cxTextEdit, cxDropDownEdit, cxCheckBox, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator;
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinscxPCPainter;

 type
  TfrmClothHCList = class(TForm)
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@ -1,8 +1,8 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 365
-  Top = 313
+  Left = 203
+  Top = 285
  Width = 1382
-  Height = 754
+  Height = 776
  Caption = #26816#39564#25253#21578
  Color = clBtnFace
  Font.Charset = GB2312_CHARSET
@ -768,7 +768,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    Left = 0
    Top = 150
    Width = 1374
-    Height = 573
+    Height = 595
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
@ -1085,12 +1085,6 @@ 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
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@ -212,7 +212,6 @@ type
    ComboBox3: TComboBox;
    Button8: TButton;
    Button10: TButton;
-    Tv1Column4: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -2305,38 +2304,64 @@ end;

 procedure TfrmJYOrderCDOne.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
-  CDName: string;
+  Column7Value: string;
+  Column7Index: Integer;
+  I: Integer;
 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 = '<27>뀌' 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;
+  // 安全检查
+  if (AViewInfo.GridRecord = nil) then
+    Exit;
+
+  try
+    // 查找 Column7 的索引
+    Column7Index := -1;
+    for I := 0 to Tv1.ColumnCount - 1 do
+    begin
+      if Tv1.Columns[I].Name = 'v1Column7' then  // 
+      begin
+        Column7Index := I;
+        Break;
+      end;
+    end;
+    
+    if Column7Index <> -1 then
+    begin
+      Column7Value := VarToStr(AViewInfo.GridRecord.Values[Column7Index]);
+      
+      // 根据 Column7 的值设置颜色
+      if Pos('横档', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clRed;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('氨纶氧化', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clYellow;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('色差', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clBlue;
+        ACanvas.Font.Color := clWhite;
+      end
+      else if Pos('脏污', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clGreen;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('其他', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clPurple;
+        ACanvas.Font.Color := clWhite;
+      end
+      else if Pos('漏底丝', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := RGB(255, 192, 203);
+        ACanvas.Font.Color := clBlack;
+      end;
+    end;
+  except
+    // 忽略异常
  end;
 end;

--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@ -1,7 +1,7 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 646
-  Top = 314
-  Width = 1545
+  Left = 196
+  Top = 90
+  Width = 1522
  Height = 738
  Caption = #25104#21697#26816#39564
  Color = clBtnFace
@ -27,6 +27,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
    TabOrder = 0
    object Tv3: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      OnCustomDrawCell = Tv3CustomDrawCell
      DataController.DataSource = DataSource3
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -180,6 +181,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
        Styles.Header = cxStyle5
        Width = 100
      end
+      object Tv3Column7: TcxGridDBColumn
+        Caption = #30133#28857#24773#20917
+        DataBinding.FieldName = 'CDList'
+        HeaderAlignmentHorz = taCenter
+        Styles.Content = cxStyle5
+        Styles.Header = cxStyle5
+        Width = 70
+      end
    end
    object cxGridLevel2: TcxGridLevel
      GridView = Tv3
@ -188,13 +197,12 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
  object ScrollBox1: TScrollBox
    Left = 1001
    Top = 87
-    Width = 536
+    Width = 513
    Height = 620
    Align = alClient
    Color = clWhite
    ParentColor = False
    TabOrder = 3
-    Visible = False
    object SpeedButton13: TSpeedButton
      Left = 7
      Top = 3
@ -207,7 +215,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
-      Visible = False
      OnClick = SpeedButton13Click
    end
    object SpeedButton14: TSpeedButton
@ -1805,7 +1812,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
    end
  end
  object MovePanel1: TMovePanel
-    Left = 1021
+    Left = 1013
    Top = 91
    Width = 351
    Height = 238
@ -2073,7 +2080,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
      object Tv2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        OnCellDblClick = Tv2CellDblClick
-        OnCustomDrawCell = Tv2CustomDrawCell
        DataController.DataSource = DataSource2
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -2207,8 +2213,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
    end
  end
  object Panel3: TPanel
-    Left = 1042
-    Top = 356
+    Left = 1018
+    Top = 340
    Width = 303
    Height = 293
    BevelInner = bvRaised
@ -2405,7 +2411,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1537
+    Width = 1514
    Height = 30
    AutoSize = True
    ButtonHeight = 30
@ -2634,7 +2640,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
  object Panel6: TPanel
    Left = 0
    Top = 30
-    Width = 1537
+    Width = 1514
    Height = 57
    Align = alTop
    BevelInner = bvRaised
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@ -269,6 +269,7 @@ type
    Label55: TLabel;
    MinbaoNo: TEdit;
    MaxbaoNo: TEdit;
+    Tv3Column7: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -329,7 +330,10 @@ 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 Tv3CustomDrawCell(Sender: TcxCustomGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      var ADone: Boolean);
   // procedure Panel3MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
  private
    { Private declarations }
@ -3135,40 +3139,70 @@ end;
 //
 //end;

-procedure TfrmMJManageNewFDNewSF.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+
+
+procedure TfrmMJManageNewFDNewSF.Tv3CustomDrawCell(
+  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
-  CDName: string;
+  Column7Value: string;
+  Column7Index: Integer;
+  I: Integer;
 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 = '<27>뀌' 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;
+  // 安全检查
+  if (AViewInfo.GridRecord = nil) then
+    Exit;
+
+  try
+    // 查找 Column7 的索引
+    Column7Index := -1;
+    for I := 0 to Tv3.ColumnCount - 1 do
+    begin
+      if Tv3.Columns[I].Name = 'Tv3Column7' then
+      begin
+        Column7Index := I;
+        Break;
+      end;
+    end;
+    
+    if Column7Index <> -1 then
+    begin
+      Column7Value := VarToStr(AViewInfo.GridRecord.Values[Column7Index]);
+      
+      // 根据 Column7 的值设置颜色
+      if Pos('横档', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clRed;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('氨纶氧化', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clYellow;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('色差', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clBlue;
+        ACanvas.Font.Color := clWhite;
+      end
+      else if Pos('脏污', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clGreen;
+        ACanvas.Font.Color := clBlack;
+      end
+      else if Pos('其他', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := clPurple;
+        ACanvas.Font.Color := clWhite;
+      end
+      else if Pos('漏底丝', Column7Value) > 0 then
+      begin
+        ACanvas.Brush.Color := RGB(255, 192, 203);
+        ACanvas.Font.Color := clBlack;
+      end;
+    end;
+  except
+    // 忽略异常
  end;
 end;