~

2025-08-30 16:54:07 +08:00 · 2025-08-30 16:54:07 +08:00 · 065caebcf1
commit 065caebcf1
parent faa7b07f60
2 changed files with 45 additions and 39 deletions
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@ -134,19 +134,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      AutoSize = True
      Caption = #25209#37327#20462#25913#30382#37325
      ImageIndex = 54
-      Wrap = True
      OnClick = ToolButton8Click
    end
    object ToolButton1: TToolButton
-      Left = 0
-      Top = 30
+      Left = 1064
+      Top = 0
      AutoSize = True
      Caption = #25171#21360#26631#31614
      ImageIndex = 96
+      Wrap = True
      OnClick = ToolButton1Click
    end
    object TCPDB: TToolButton
-      Left = 87
+      Left = 0
      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 = 87
      Top = 30
      AutoSize = True
      Caption = #25171#21360#21253#26631#31614
@ -163,7 +163,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton3Click
    end
    object ToolButton2: TToolButton
-      Left = 273
+      Left = 186
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26816#39564#25253#21578
@ -171,7 +171,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton2Click
    end
    object ToolButton5: TToolButton
-      Left = 384
+      Left = 297
      Top = 30
      AutoSize = True
      Caption = #25171#21360
@ -179,7 +179,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton5Click
    end
    object Edit3: TEdit
-      Left = 447
+      Left = 360
      Top = 30
      Width = 68
      Height = 30
@ -194,7 +194,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnKeyPress = Edit3KeyPress
    end
    object ComboBox1: TComboBox
-      Left = 515
+      Left = 428
      Top = 33
      Width = 149
      Height = 24
@ -219,7 +219,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        #26816#39564#30721#21333)
    end
    object Edit4: TEdit
-      Left = 664
+      Left = 577
      Top = 30
      Width = 121
      Height = 30
@ -233,7 +233,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Visible = False
    end
    object ToolButton12: TToolButton
-      Left = 785
+      Left = 698
      Top = 30
      Caption = #20462#25913#30721#21333
      ImageIndex = 54
@ -241,7 +241,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton12Click
    end
    object ToolButton9: TToolButton
-      Left = 904
+      Left = 817
      Top = 30
      AutoSize = True
      Caption = #24322#24120#25968#25454
@ -249,7 +249,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton9Click
    end
    object TBExport: TToolButton
-      Left = 991
+      Left = 904
      Top = 30
      AutoSize = True
      Caption = #23548#20986
@ -257,7 +257,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = TBExportClick
    end
    object ToolButton14: TToolButton
-      Left = 1054
+      Left = 967
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26631#31614#30721#21333
@ -265,7 +265,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton14Click
    end
    object TBClose: TToolButton
-      Left = 1165
+      Left = 1078
      Top = 30
      AutoSize = True
      Caption = #20851#38381
@ -887,6 +887,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      DataController.Summary.SummaryGroups = <>
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
+      OptionsView.Indicator = True
      Styles.Inactive = DataLink_TradeManage.SHuangSe
      Styles.IncSearch = DataLink_TradeManage.SHuangSe
      Styles.Selection = DataLink_TradeManage.SHuangSe
@ -895,6 +896,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        Caption = #36873#20013
        DataBinding.FieldName = 'SSel'
        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
        Properties.NullStyle = nssUnchecked
        Properties.OnChange = v1Column22PropertiesChange
        HeaderAlignmentHorz = taCenter
@ -1035,6 +1037,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      object v1Column9: TcxGridDBColumn
        Caption = #30133#28857#25968#37327
        DataBinding.FieldName = 'CDQty'
+        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 65
@ -1042,6 +1045,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      object v1Column7: TcxGridDBColumn
        Caption = #30133#28857#24773#20917
        DataBinding.FieldName = 'CDList'
+        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -1074,6 +1078,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      object v1Column14: TcxGridDBColumn
        Caption = #25187#20998
        DataBinding.FieldName = 'KouFenQty'
+        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 55
@ -1936,13 +1941,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    Left = 440
    Top = 356
  end
-  object ADOQueryMain: TADOQuery
-    Connection = DataLink_TradeManage.ADOLink
-    LockType = ltReadOnly
-    Parameters = <>
-    Left = 436
-    Top = 336
-  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_TradeManage.ADOLink
    LockType = ltReadOnly
@ -2155,4 +2153,11 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    Left = 488
    Top = 592
  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeManage.ADOLink
+    CommandTimeout = 60
+    Parameters = <>
+    Left = 256
+    Top = 544
+  end
 end
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@ -40,7 +40,6 @@ type
    cxGrid1: TcxGrid;
    cxGridPopupMenu1: TcxGridPopupMenu;
    ADOQueryCmd: TADOQuery;
-    ADOQueryMain: TADOQuery;
    ADOQueryTemp: TADOQuery;
    DataSource1: TDataSource;
    Label3: TLabel;
@ -228,6 +227,7 @@ type
    Tv1Column3: TcxGridDBColumn;
    CustomerNoName: TEdit;
    ToolButton14: TToolButton;
+    ADOQueryMain: TADOQuery;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -396,21 +396,22 @@ begin
      Close;
      Filtered := False;
      sql.Clear;
-      sql.Add('select A.*,C.CustomerNoName,');
-      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('select A.*,');
+      SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno');
+      sql.Add(',C.CustomerNoName,C.OrderNo,B.PRTCodeName,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PIH');
+//      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_sub B on B.MainID=A.MainID and B.subID=A.subID ');
      sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID ');
      sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' ');
      sql.Add('and  A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
      if Trim(DParameters2) = '´ÎÆ·' then
      begin
-        sql.add('and mjtype=''´ÎÆ·'' ');
+        sql.add('and mjtype=''´ÎÆ·'' ');                    
      end;
      sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
+//      showmessage(sql.text);
      Open;
    end;
    SCreateCDS20(ADOQueryMain, Order_Main);
@ -473,7 +474,7 @@ var
  fsj, Strmd: string;
 begin
  ReadCxGrid('¼ìÑé±¨¸æJF', Tv1, '¼ìÑé¹ÜÀí');
-  fsj := 'select distinct(Filler) name from WFB_MJJY   ';
+  fsj := 'select distinct(Filler) name from WFB_MJJY where FillTime>getdate()-30   ';
  Strmd := 'select distinct(text) name,index1 from A_MaDan order by index1  ';
  SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj);
  SInitComBoxBySql(ADOQueryCmd, ComboBox1, False, Strmd);
@ -511,7 +512,7 @@ begin
  SDofilter(ADOQueryMain, fsj);
  SCreateCDS20(ADOQueryMain, Order_Main);
  SInitCDSData20(ADOQueryMain, Order_Main);
-  JSbaoNum();
+ // JSbaoNum();
 end;

 procedure TfrmJYOrderCDOne.TBExportClick(Sender: TObject);
@ -1938,15 +1939,15 @@ procedure TfrmJYOrderCDOne.v1Column22PropertiesChange(Sender: TObject);
 begin
  FID := trim(Order_Main.Fieldbyname('MJID').AsString);
  Order_Main.Edit;
-  if Order_Main.FieldByName('ssel').AsBoolean = false then
-  begin
-    Order_Main.FieldByName('ssel').AsBoolean := True;
-  end
-  else
-    Order_Main.FieldByName('ssel').AsBoolean := False;
+//  if Order_Main.FieldByName('ssel').AsBoolean = false then
+//  begin
+//    Order_Main.FieldByName('ssel').AsBoolean := True;
+//  end
+//  else
+//    Order_Main.FieldByName('ssel').AsBoolean := False;          

  InitSum();
-end;
+end;                                                             

 procedure TfrmJYOrderCDOne.Image1Click(Sender: TObject);
 begin