~

2025-09-29 09:24:49 +08:00 · 2025-09-29 09:24:49 +08:00 · 12f3d63f0c
commit 12f3d63f0c
parent a28087d015
5 changed files with 85 additions and 51 deletions
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@ -21,8 +21,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1392
-    Height = 62
+    Width = 1384
+    Height = 92
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 119
@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Top = 0
      Caption = #25209#37327#20462#25913#32568#21495
      ImageIndex = 54
+      Wrap = True
      OnClick = ToolButton11Click
    end
    object TBDW: TToolButton
-      Left = 608
-      Top = 0
+      Left = 0
+      Top = 30
      AutoSize = True
      Caption = #20462#25913#25968#37327#21333#20301
      ImageIndex = 54
      OnClick = TBDWClick
    end
    object ToolButton4: TToolButton
-      Left = 719
-      Top = 0
+      Left = 111
+      Top = 30
      AutoSize = True
      Caption = #25209#37327#35843#25972#31859#25968
      ImageIndex = 54
      OnClick = ToolButton4Click
    end
    object ToolButton13: TToolButton
-      Left = 830
-      Top = 0
+      Left = 222
+      Top = 30
      AutoSize = True
      Caption = #25209#37327#20928#37325#36716#38271#24230
      ImageIndex = 54
@ -129,16 +130,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton13Click
    end
    object ToolButton8: TToolButton
-      Left = 953
-      Top = 0
+      Left = 345
+      Top = 30
      AutoSize = True
      Caption = #25209#37327#20462#25913#30382#37325
      ImageIndex = 54
-      Wrap = True
      OnClick = ToolButton8Click
    end
    object ToolButton1: TToolButton
-      Left = 0
+      Left = 456
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26631#31614
@ -146,7 +146,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton1Click
    end
    object TCPDB: TToolButton
-      Left = 87
+      Left = 543
      Top = 30
      AutoSize = True
      Caption = #25104#21697#25171#21253
@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = TCPDBClick
    end
    object ToolButton3: TToolButton
-      Left = 174
+      Left = 630
      Top = 30
      AutoSize = True
      Caption = #25171#21360#21253#26631#31614
@ -163,24 +163,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton3Click
    end
    object ToolButton2: TToolButton
-      Left = 273
+      Left = 729
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26816#39564#25253#21578
      ImageIndex = 12
+      Wrap = True
      OnClick = ToolButton2Click
    end
    object ToolButton5: TToolButton
-      Left = 384
-      Top = 30
+      Left = 0
+      Top = 60
      AutoSize = True
      Caption = #25171#21360
      ImageIndex = 12
      OnClick = ToolButton5Click
    end
    object Edit3: TEdit
-      Left = 447
-      Top = 30
+      Left = 63
+      Top = 60
      Width = 68
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -194,8 +195,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnKeyPress = Edit3KeyPress
    end
    object ComboBox1: TComboBox
-      Left = 515
-      Top = 33
+      Left = 131
+      Top = 63
      Width = 149
      Height = 24
      Style = csDropDownList
@ -219,8 +220,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        #26816#39564#30721#21333)
    end
    object Edit4: TEdit
-      Left = 664
-      Top = 30
+      Left = 280
+      Top = 60
      Width = 121
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -233,32 +234,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Visible = False
    end
    object ToolButton12: TToolButton
-      Left = 785
-      Top = 30
+      Left = 401
+      Top = 60
      Caption = #20462#25913#30721#21333
      ImageIndex = 54
      Visible = False
      OnClick = ToolButton12Click
    end
    object ToolButton9: TToolButton
-      Left = 904
-      Top = 30
+      Left = 520
+      Top = 60
      AutoSize = True
      Caption = #24322#24120#25968#25454
      ImageIndex = 2
      OnClick = ToolButton9Click
    end
    object TBExport: TToolButton
-      Left = 991
-      Top = 30
+      Left = 607
+      Top = 60
      AutoSize = True
      Caption = #23548#20986
      ImageIndex = 75
      OnClick = TBExportClick
    end
    object TBClose: TToolButton
-      Left = 1054
-      Top = 30
+      Left = 670
+      Top = 60
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 55
@ -267,8 +268,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object Panel1: TPanel
    Left = 0
-    Top = 62
-    Width = 1392
+    Top = 92
+    Width = 1384
    Height = 88
    Align = alTop
    BevelInner = bvRaised
@ -782,9 +783,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 150
-    Width = 1392
-    Height = 576
+    Top = 180
+    Width = 1384
+    Height = 538
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@ -11,7 +11,20 @@ uses
  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
-  cxCurrencyEdit, MMSystem;
+  cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;

 type
  TfrmJYOrderCDOne = class(TForm)
@ -378,9 +391,9 @@ begin
      sql.Clear;
      sql.Add('select A.*,');           
      SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,');
-      sql.Add('C.OrderNo,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('C.OrderNo,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('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 ');
--- a/打卷检验管理/U_ProductOrderNewList.dfm
+++ b/打卷检验管理/U_ProductOrderNewList.dfm
@ -422,6 +422,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
    TabOrder = 3
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      OnCellClick = Tv1CellClick
      OnCellDblClick = Tv1CellDblClick
      OnFocusedRecordChanged = Tv1FocusedRecordChanged
      DataController.DataSource = DataSource1
--- a/打卷检验管理/U_ProductOrderNewList.pas
+++ b/打卷检验管理/U_ProductOrderNewList.pas
@ -12,7 +12,20 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer,
  cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
  IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxBarBuiltInMenu;
+  dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter;

 type
  TfrmProductOrderNewList = class(TForm)
@ -190,6 +203,7 @@ type
    procedure ToolButton5Click(Sender: TObject);
    procedure ToolButton6Click(Sender: TObject);
    procedure ToolButton7Click(Sender: TObject);
+    procedure Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
  private
    DQdate: TDateTime;
    FMainId: string;
@ -874,16 +888,16 @@ begin
    Close;
    sql.Clear;
    sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId),  ');
-    sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),');
-    sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),');
-    sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),');
-    sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )');
+    sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId)');
+//    sql.add(',FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),');
+//    sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),');
+//    sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )');
    sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId ');
    sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid ');
   // sql.Add(' left join TP_File D on D.TFID=A.orderNO  ');
    sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
    sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
-
+//      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS20(ADOQueryPrint, CDS_Print);
@ -908,7 +922,7 @@ end;

 procedure TfrmProductOrderNewList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
-  InitSub();
+//  InitSub();
 end;

 procedure TfrmProductOrderNewList.TFJClick(Sender: TObject);
@ -1119,5 +1133,10 @@ begin
  end;
 end;

+procedure TfrmProductOrderNewList.Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+  InitSub();
+end;
+
 end.