码单登记打印标签

T02贸易汇总仓库/U_ItemizedListInPut.dfm

@@ -3,11 +3,11 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
   Top = 4
   Caption = #35746#21333#24405#20837
   ClientHeight = 593
-  ClientWidth = 850
+  ClientWidth = 938
   Font.Charset = GB2312_CHARSET
   Font.Height = -16
   Position = poMainFormCenter
-  ExplicitWidth = 866
+  ExplicitWidth = 954
   ExplicitHeight = 632
   PixelsPerInch = 96
   TextHeight = 21
@@ -15,7 +15,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     Tag = 1
     Left = 0
     Top = 0
-    Width = 850
+    Width = 938
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -27,7 +27,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     List = True
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 798
+    ExplicitWidth = 850
     object TBSave: TToolButton
       Left = 0
       Top = 0
@@ -57,7 +57,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     Tag = 1
     Left = 0
     Top = 193
-    Width = 850
+    Width = 938
     Height = 30
     ButtonHeight = 30
     ButtonWidth = 99
@@ -68,7 +68,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     List = True
     ShowCaptions = True
     TabOrder = 1
-    ExplicitWidth = 798
+    ExplicitWidth = 850
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -98,34 +98,34 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
   object Panel2: TPanel [2]
     Left = 0
     Top = 223
-    Width = 850
+    Width = 938
     Height = 370
     Align = alClient
     Caption = 'Panel2'
     TabOrder = 2
-    ExplicitWidth = 798
+    ExplicitWidth = 850
     object Panel3: TPanel
       Left = 1
       Top = 1
-      Width = 848
+      Width = 936
       Height = 368
       Align = alClient
       Caption = 'Panel2'
       TabOrder = 0
-      ExplicitWidth = 796
+      ExplicitWidth = 848
       object cxGrid1: TcxGrid
         Left = 1
         Top = 1
-        Width = 846
+        Width = 934
         Height = 366
         Align = alClient
         PopupMenu = PopupMenu2
         TabOrder = 0
-        ExplicitLeft = 11
+        ExplicitLeft = -1
-        ExplicitTop = -1
+        ExplicitTop = 5
-        ExplicitWidth = 764
         object Tv1: TcxGridDBTableView
           OnDblClick = Tv1DblClick
+          OnMouseDown = Tv1MouseDown
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
           DataController.DataSource = DS_1
@@ -207,16 +207,39 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
             DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxButtonEditProperties'
+            PropertiesClassName = 'TcxLookupComboBoxProperties'
-            Properties.Buttons = <
+            Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
+            Properties.KeyFieldNames = 'C_Name'
+            Properties.ListColumns = <
               item
-                Default = True
+                Caption = #21697#21517
-                Kind = bkEllipsis
+                FieldName = 'C_Name'
               end>
-            Properties.ReadOnly = True
+            Properties.ListSource = DS_PM
-            Properties.OnButtonClick = Tv1Column1PropertiesButtonClick
+            Properties.OnEditValueChanged = Tv1Column7PropertiesEditValueChanged
             HeaderAlignmentHorz = taCenter
-            Width = 127
+            Width = 145
+          end
+          object Tv1Column5: TcxGridDBColumn
+            Caption = #33394#21495
+            DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxLookupComboBoxProperties'
+            Properties.IncrementalFilteringOptions = [ifoUseContainsOperator]
+            Properties.KeyFieldNames = 'C_ColorNo'
+            Properties.ListColumns = <
+              item
+                Caption = #33394#21495
+                FieldName = 'C_ColorNo'
+              end
+              item
+                Caption = #39068#33394
+                FieldName = 'C_Color'
+              end>
+            Properties.ListSource = DS_YS
+            Properties.OnEditValueChanged = Tv1Column5PropertiesEditValueChanged
+            HeaderAlignmentHorz = taCenter
+            Width = 130
           end
           object v1PRTColor: TcxGridDBColumn
             Caption = #39068#33394
@@ -230,7 +253,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
               end>
             Properties.ReadOnly = False
             HeaderAlignmentHorz = taCenter
-            Width = 73
+            Width = 93
           end
           object VC_PRTPs: TcxGridDBColumn
             Caption = #21305#25968
@@ -285,7 +308,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
   object ScrollBox1: TScrollBox [3]
     Left = 0
     Top = 30
-    Width = 850
+    Width = 938
     Height = 163
     Align = alTop
     BevelInner = bvNone
@@ -294,7 +317,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     Ctl3D = False
     ParentCtl3D = False
     TabOrder = 3
-    ExplicitWidth = 798
+    ExplicitWidth = 850
     object Label3: TLabel
       Left = 377
       Top = 11
@@ -319,9 +342,9 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     object Label14: TLabel
       Left = 21
       Top = 51
-      Width = 48
+      Width = 64
       Height = 21
-      Caption = #20379#24212#21830
+      Caption = #23545#26041#21333#20301
     end
     object Label4: TLabel
       Left = 377
@@ -374,7 +397,8 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
       Properties.DropDownListStyle = lsFixedList
       Properties.Items.Strings = (
         #21152#24037#23436#25104
-        #22238#20462#23436#25104)
+        #22238#20462#23436#25104
+        #23458#25143#36864#36135)
       TabOrder = 4
       Text = #21152#24037#23436#25104
       Width = 200
@@ -382,70 +406,70 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
   end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 209
+    Left = 361
-    Top = 504
+    Top = 94
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 321
+    Left = 455
-    Top = 513
+    Top = 94
   end
   inherited ImageList_new32: TImageList
-    Left = 128
+    Left = 455
-    Top = 346
+    Top = 470
   end
   inherited cxImageList_bar: TcxImageList
     FormatVersion = 1
-    Left = 1480
+    Left = 267
-    Top = 32
+    Top = 376
-    DesignInfo = 2098632
+    DesignInfo = 24641803
   end
   object ADOTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 388
+    Left = 643
-    Top = 368
+    Top = 94
   end
   object ADOCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 492
+    Left = 267
-    Top = 385
+    Top = 94
   end
   object DS_1: TDataSource
     DataSet = CDS_1
-    Left = 584
+    Left = 361
-    Top = 512
+    Top = 376
   end
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 491
+    Left = 361
-    Top = 508
+    Top = 282
   end
   object GPM_1: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 412
+    Left = 549
-    Top = 517
+    Top = 282
   end
   object ADOQueryLabel: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 932
+    Left = 549
-    Top = 421
+    Top = 94
   end
   object ADO_I1: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 1288
+    Left = 455
-    Top = 361
+    Top = 188
   end
   object DS_I1: TDataSource
     DataSet = ADO_I1
-    Left = 1220
+    Left = 549
-    Top = 365
+    Top = 376
   end
   object IdFTP1: TIdFTP
     ConnectTimeout = 0
@@ -455,23 +479,23 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
     ProxySettings.ProxyType = fpcmNone
     ProxySettings.Port = 0
     ReadTimeout = 0
-    Left = 1066
+    Left = 361
-    Top = 366
+    Top = 470
   end
   object ADO_I2: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 1109
+    Left = 549
-    Top = 351
+    Top = 188
   end
   object DS_I2: TDataSource
     DataSet = ADO_I2
-    Left = 1171
+    Left = 643
-    Top = 355
+    Top = 376
   end
   object PopupMenu2: TPopupMenu
-    Left = 676
+    Left = 549
-    Top = 356
+    Top = 470
     object N3: TMenuItem
       Caption = #20840#36873
       OnClick = N3Click
@@ -484,39 +508,63 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
   object GPM_2: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 592
+    Left = 643
-    Top = 379
+    Top = 282
   end
   object CDS_2: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 727
+    Left = 455
-    Top = 408
+    Top = 282
   end
   object DS_2: TDataSource
     DataSet = CDS_2
-    Left = 832
+    Left = 455
-    Top = 288
+    Top = 376
   end
   object ADO_2: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 572
+    Left = 361
-    Top = 312
+    Top = 188
   end
   object ADO_YQ: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 254
+    Left = 267
-    Top = 366
+    Top = 282
   end
   object ADO_1: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 340
+    Left = 267
-    Top = 438
+    Top = 188
+  end
+  object DS_PM: TDataSource
+    DataSet = ADO_PM
+    Left = 267
+    Top = 470
+  end
+  object ADO_PM: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 643
+    Top = 188
+  end
+  object ADO_YS: TADOQuery
+    Connection = DataLink_TradeTotalClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 779
+    Top = 204
+  end
+  object DS_YS: TDataSource
+    DataSet = ADO_YS
+    Left = 755
+    Top = 340
   end
 end

T02贸易汇总仓库/U_ItemizedListInPut.pas

@@ -16,7 +16,7 @@ uses
   U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI,
   dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters,
-  dxCore, cxDateUtils, Clipbrd;
+  dxCore, cxDateUtils, Clipbrd, cxDBLookupComboBox;
 
 type
   TfrmItemizedListInPut = class(TfrmBaseInput)
@@ -74,6 +74,11 @@ type
     ADO_1: TADOQuery;
     Label4: TLabel;
     TIMType: TcxComboBox;
+    Tv1Column5: TcxGridDBColumn;
+    DS_PM: TDataSource;
+    ADO_PM: TADOQuery;
+    ADO_YS: TADOQuery;
+    DS_YS: TDataSource;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -96,6 +101,9 @@ type
     procedure N3Click(Sender: TObject);
     procedure N4Click(Sender: TObject);
     procedure Tv1DblClick(Sender: TObject);
+    procedure Tv1Column7PropertiesEditValueChanged(Sender: TObject);
+    procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+    procedure Tv1Column5PropertiesEditValueChanged(Sender: TObject);
   private
     FSCXDH: string;
     procedure InitData();
@@ -296,7 +304,13 @@ begin
   TIMNo.Text := '';
   fFlileFlag := UserDataFlag + 'HX';
   InitData();
-
+  with ADO_PM do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('  SELECT C_Code,C_Name FROM Bs_Cloth_Info');
+    Open;
+  end;
 end;
 
 function TfrmItemizedListInPut.SaveData(): Boolean;
@@ -524,7 +538,7 @@ begin
       ADOCmd.Connection.BeginTrans;
       while CDS_1.Locate('SSel', true, []) do
       begin
-        if Trim(CDS_1.fieldbyname('TMSId').AsString) <> '' then
+        if Trim(CDS_1.fieldbyname('TISId').AsString) <> '' then
         begin
           with ADOCmd do
           begin
@@ -700,6 +714,9 @@ begin
     frmCompanySel := TfrmCompanySel.Create(Application);
     with frmCompanySel do
     begin
+      if TIMType.Text = '¿Í»§ÍË»õ' then
+        FCoType := '¿Í»§'
+      else
         FCoType := '¹©Ó¦ÉÌ';
       if ShowModal = 1 then
       begin
@@ -896,10 +913,11 @@ begin
           Fieldbyname('C_Composition').AsString := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Composition').AsString);
           Fieldbyname('C_Width').AsString := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Width').AsString);
           Fieldbyname('C_GramWeight').AsString := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_GramWeight').AsString);
-
+          Fieldbyname('TISUnit').AsString := trim(frmClothInfoSel.CDS_1.Fieldbyname('qtyunit').AsString);
-          Fieldbyname('C_ColorNo').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_ColorNo').AsString);
+          CDS_3.Locate('ssel', True, []);
-          Fieldbyname('C_Color').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Color').AsString);
+          Fieldbyname('C_ColorNo').value := trim(frmClothInfoSel.CDS_3.Fieldbyname('C_ColorNo').AsString);
-          Fieldbyname('C_Pattern').value := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Pattern').AsString);
+          Fieldbyname('C_Color').value := trim(frmClothInfoSel.CDS_3.Fieldbyname('C_Color').AsString);
+          Fieldbyname('C_Pattern').value := trim(frmClothInfoSel.CDS_3.Fieldbyname('C_Pattern').AsString);
           post;
         end;
 
@@ -911,6 +929,46 @@ begin
 
 end;
 
+procedure TfrmItemizedListInPut.Tv1Column5PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+begin
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+  mvalue := TcxTextEdit(Sender).EditingText;
+
+  with CDS_1 do
+  begin
+    Edit;
+    FieldByName(FFieldName).Value := Trim(mvalue);
+    Post;
+    ADO_YS.Locate('C_ColorNo', mvalue, []);
+    Edit;
+    FieldByName('C_Color').Value := ADO_YS.FieldByName('C_Color').Value;
+    Post;
+  end;
+end;
+
+procedure TfrmItemizedListInPut.Tv1Column7PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+begin
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+  mvalue := TcxTextEdit(Sender).EditingText;
+
+  with CDS_1 do
+  begin
+
+    Edit;
+    FieldByName(FFieldName).Value := Trim(mvalue);
+    Post;
+    ADO_PM.Locate('C_Name', mvalue, []);
+    Edit;
+    FieldByName('C_Code').Value := ADO_PM.FieldByName('C_Code').Value;
+    Post;
+  end;
+
+end;
+
 procedure TfrmItemizedListInPut.Tv1DblClick(Sender: TObject);
 begin
   if Trim(CDS_1.FieldByName('TISUnit').AsString) = '' then
@@ -927,6 +985,7 @@ begin
       begin
         FTIMId := Self.FTIMId;
         FTISId := Trim(CDS_1.FieldByName('TISId').AsString);
+        FQtyUnit := Trim(CDS_1.FieldByName('TISUnit').AsString);
         if ShowModal = 1 then
         begin
           Self.initGrid1(Self.FTIMID);
@@ -938,6 +997,36 @@ begin
   end;
 end;
 
+procedure TfrmItemizedListInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+begin
+  if not ADO_YS.IsEmpty then
+  begin
+    if ADO_YS.FieldByName('C_Code').AsString <> CDS_1.FieldByName('C_Code').AsString then
+    begin
+      with ADO_YS do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add(' SELECT A.C_Code,B.C_Color,B.C_ColorNo FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+        sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString));
+        Open;
+      end;
+    end;
+  end
+  else
+  begin
+    with ADO_YS do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' SELECT A.C_Code,B.C_Color,B.C_ColorNo FROM  Bs_Cloth_Info A inner join BS_Cloth_Info_Sub B on A.BCIID=B.BCIID ');
+      sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString));
+      Open;
+    end;
+  end;
+
+end;
+
 procedure TfrmItemizedListInPut.v1Column5PropertiesEditValueChanged(Sender: TObject);
 var
   mvalue, FFieldName: string;

T02贸易汇总仓库/U_ItemizedListList.dfm

@@ -26,7 +26,7 @@ inherited frmItemizedListList: TfrmItemizedListList
     Images = DataLink_TradeTotalClothStk.cxImageList_bar
     List = True
     ShowCaptions = True
-    TabOrder = 4
+    TabOrder = 3
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -75,16 +75,24 @@ inherited frmItemizedListList: TfrmItemizedListList
       ImageIndex = 11
       OnClick = TnochkClick
     end
-    object TBPrint: TToolButton
+    object ToolButton1: TToolButton
       Left = 458
       Top = 0
       AutoSize = True
-      Caption = #25171#21360
+      Caption = #26631#31614#25171#21360
+      ImageIndex = 21
+      OnClick = ToolButton1Click
+    end
+    object TBPrint: TToolButton
+      Left = 561
+      Top = 0
+      AutoSize = True
+      Caption = #30721#21333#25171#21360
       ImageIndex = 21
       OnClick = TBPrintClick
     end
     object TBCK: TToolButton
-      Left = 529
+      Left = 664
       Top = 0
       AutoSize = True
       Caption = #26597#30475
@@ -92,7 +100,7 @@ inherited frmItemizedListList: TfrmItemizedListList
       OnClick = TBCKClick
     end
     object ToolButton4: TToolButton
-      Left = 600
+      Left = 735
       Top = 0
       AutoSize = True
       Caption = #38468#20214
@@ -100,7 +108,7 @@ inherited frmItemizedListList: TfrmItemizedListList
       OnClick = ToolButton4Click
     end
     object ToolButton2: TToolButton
-      Left = 671
+      Left = 806
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -108,7 +116,7 @@ inherited frmItemizedListList: TfrmItemizedListList
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 774
+      Left = 909
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -125,7 +133,7 @@ inherited frmItemizedListList: TfrmItemizedListList
     BevelInner = bvRaised
     BevelOuter = bvLowered
     ParentBackground = False
-    TabOrder = 6
+    TabOrder = 4
     object Label3: TLabel
       Left = 24
       Top = 51
@@ -178,136 +186,7 @@ inherited frmItemizedListList: TfrmItemizedListList
       end
     end
   end
-  object cxGrid1: TcxGrid [2]
+  object cxTabControl1: TcxTabControl [2]
-    Left = 0
-    Top = 152
-    Width = 1411
-    Height = 380
-    Align = alClient
-    PopupMenu = PM_1
-    TabOrder = 3
-    ExplicitTop = 154
-    object Tv1: TcxGridDBTableView
-      Navigator.Buttons.CustomButtons = <>
-      ScrollbarAnnotations.CustomAnnotations = <>
-      OnCellDblClick = Tv1CellDblClick
-      OnFocusedRecordChanged = Tv1FocusedRecordChanged
-      DataController.DataSource = DataSource1
-      DataController.Filter.AutoDataSetFilter = True
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-      DataController.Summary.DefaultGroupSummaryItems = <>
-      DataController.Summary.FooterSummaryItems = <
-        item
-          Kind = skSum
-          Column = Tv1Column11
-        end
-        item
-          Kind = skSum
-          Column = Tv1Column10
-        end>
-      DataController.Summary.SummaryGroups = <>
-      OptionsBehavior.CellHints = True
-      OptionsCustomize.ColumnFiltering = False
-      OptionsView.Footer = True
-      OptionsView.GroupByBox = False
-      OptionsView.IndicatorWidth = 30
-      object v1Column16: TcxGridDBColumn
-        Caption = #36873#25321
-        DataBinding.FieldName = 'SSel'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCheckBoxProperties'
-        Properties.ImmediatePost = True
-        HeaderAlignmentHorz = taCenter
-        Width = 50
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #30721#21333#21495
-        DataBinding.FieldName = 'TIMNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 111
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #30721#21333#31867#22411
-        DataBinding.FieldName = 'TIMType'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 91
-      end
-      object v1OrdDate: TcxGridDBColumn
-        Caption = #30721#21333#26085#26399
-        DataBinding.FieldName = 'TIMDate'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.ShowTime = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 122
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #23545#26041#21333#20301
-        DataBinding.FieldName = 'OOPCoName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 94
-      end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'HZPiQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #25968#37327
-        DataBinding.FieldName = 'OrdQty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column11: TcxGridDBColumn
-        Caption = #21333#20301
-        DataBinding.FieldName = 'OrdUnit'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #21046#21333#20154
-        DataBinding.FieldName = 'FILLER'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'OrdNote'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-    end
-    object cxGrid1Level1: TcxGridLevel
-      GridView = Tv1
-    end
-  end
-  object cxSplitter1: TcxSplitter [3]
-    Left = 0
-    Top = 532
-    Width = 1411
-    Height = 8
-    HotZoneClassName = 'TcxMediaPlayer9Style'
-    AlignSplitter = salBottom
-  end
-  object cxTabControl1: TcxTabControl [4]
     Left = 0
     Top = 121
     Width = 1411
@@ -326,28 +205,34 @@ inherited frmItemizedListList: TfrmItemizedListList
     ClientRectRight = 1411
     ClientRectTop = 28
   end
-  object Panel2: TPanel [5]
+  inherited loadProcess: TPanel
+    Left = 584
+    Top = 286
+    ExplicitLeft = 584
+    ExplicitTop = 286
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 584
+    Top = 350
+    ExplicitLeft = 584
+    ExplicitTop = 350
+    ExplicitWidth = 169
+    ExplicitHeight = 29
+    Width = 169
+  end
+  object cxGrid1: TcxGrid [5]
     Left = 0
-    Top = 540
+    Top = 152
     Width = 1411
-    Height = 196
+    Height = 584
-    Align = alBottom
-    BevelOuter = bvNone
-    Caption = 'Panel2'
-    TabOrder = 5
-    object cxGrid2: TcxGrid
-      Left = 0
-      Top = 0
-      Width = 1411
-      Height = 196
     Align = alClient
-      TabOrder = 0
+    TabOrder = 5
     ExplicitLeft = 2
-      ExplicitTop = 6
+    ExplicitTop = 158
-      object TV2: TcxGridDBTableView
+    object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
-        DataController.DataSource = DataSource2
+      DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -386,11 +271,21 @@ inherited frmItemizedListList: TfrmItemizedListList
       OptionsData.Deleting = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
+      object TV1Column5: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'ssel'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 50
       end
       object cxGridDBColumn3: TcxGridDBColumn
@@ -404,6 +299,7 @@ inherited frmItemizedListList: TfrmItemizedListList
             Kind = bkEllipsis
           end>
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 104
       end
       object Tv1Column7: TcxGridDBColumn
@@ -411,6 +307,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 106
       end
       object v1PRTColor: TcxGridDBColumn
@@ -425,6 +322,7 @@ inherited frmItemizedListList: TfrmItemizedListList
           end>
         Properties.ReadOnly = False
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 92
       end
       object cxGridDBColumn4: TcxGridDBColumn
@@ -432,6 +330,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'C_Pattern'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 80
       end
       object cxGridDBColumn5: TcxGridDBColumn
@@ -439,6 +338,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'C_Width'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 70
       end
       object cxGridDBColumn6: TcxGridDBColumn
@@ -446,6 +346,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'C_GramWeight'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 70
       end
       object VC_PRTPs: TcxGridDBColumn
@@ -453,6 +354,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'TISPiece'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 74
       end
       object v1PRTOrderQty: TcxGridDBColumn
@@ -461,6 +363,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 68
       end
       object Tv1Column8: TcxGridDBColumn
@@ -473,6 +376,7 @@ inherited frmItemizedListList: TfrmItemizedListList
           'Y'
           'Kg')
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 77
       end
       object cxGridDBColumn7: TcxGridDBColumn
@@ -480,6 +384,7 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'Price'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 58
       end
       object cxGridDBColumn9: TcxGridDBColumn
@@ -487,98 +392,109 @@ inherited frmItemizedListList: TfrmItemizedListList
         DataBinding.FieldName = 'OrdSNote'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-          Width = 159
+        Options.Editing = False
+        Width = 157
+      end
+      object TV1Column1: TcxGridDBColumn
+        Caption = #30721#21333#21495
+        DataBinding.FieldName = 'TIMNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object TV1Column2: TcxGridDBColumn
+        Caption = #30721#21333#31867#22411
+        DataBinding.FieldName = 'TIMType'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object TV1Column3: TcxGridDBColumn
+        Caption = #30721#21333#26085#26399
+        DataBinding.FieldName = 'TIMDate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object TV1Column4: TcxGridDBColumn
+        Caption = #23545#26041#21333#20301
+        DataBinding.FieldName = 'OOPCoName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
       end
     end
     object cxGridLevel1: TcxGridLevel
-        GridView = TV2
+      GridView = TV1
     end
   end
-  end
-  inherited loadProcess: TPanel
-    Left = 584
-    Top = 286
-    ExplicitLeft = 584
-    ExplicitTop = 286
-  end
-  inherited cxProgressBar2: TcxProgressBar
-    Left = 584
-    Top = 350
-    ExplicitLeft = 584
-    ExplicitTop = 350
-    ExplicitWidth = 169
-    ExplicitHeight = 29
-    Width = 169
-  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 255
+    Left = 503
-    Top = 314
+    Top = 213
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
-    Left = 157
+    Left = 597
-    Top = 256
+    Top = 213
   end
   object cxgrdpmn1: TcxGridPopupMenu
-    Grid = cxGrid1
     PopupMenus = <>
-    Left = 660
+    Left = 503
-    Top = 454
+    Top = 401
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 568
+    Left = 691
-    Top = 240
+    Top = 213
   end
   object ADOQueryMain: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 420
+    Left = 879
-    Top = 216
+    Top = 213
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 320
+    Left = 597
-    Top = 224
+    Top = 307
   end
   object DataSource1: TDataSource
     DataSet = Order_Main
-    Left = 812
+    Left = 785
-    Top = 440
+    Top = 401
   end
   object Order_Main: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 724
+    Left = 785
-    Top = 432
+    Top = 307
   end
   object ADOQuerySub: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     Parameters = <>
-    Left = 296
+    Left = 503
-    Top = 404
+    Top = 307
-  end
-  object DataSource2: TDataSource
-    DataSet = ORDER_SUB
-    Left = 488
-    Top = 448
   end
   object ADOQueryImage: TADOQuery
     Connection = DataLink_TradeTotalClothStk.ADOLink
     EnableBCD = False
     Parameters = <>
-    Left = 316
+    Left = 785
-    Top = 283
+    Top = 213
   end
   object DSImage: TDataSource
     DataSet = ADOQueryImage
-    Left = 416
+    Left = 503
-    Top = 288
+    Top = 495
   end
   object IdFTP1: TIdFTP
     ConnectTimeout = 0
@@ -588,18 +504,12 @@ inherited frmItemizedListList: TfrmItemizedListList
     ProxySettings.ProxyType = fpcmNone
     ProxySettings.Port = 0
     ReadTimeout = 0
-    Left = 92
+    Left = 597
-    Top = 258
+    Top = 495
-  end
-  object ORDER_SUB: TClientDataSet
-    Aggregates = <>
-    Params = <>
-    Left = 208
-    Top = 412
   end
   object PopupMenu2: TPopupMenu
-    Left = 600
+    Left = 785
-    Top = 454
+    Top = 495
     object N3: TMenuItem
       Caption = #20840#36873
       OnClick = N3Click
@@ -614,28 +524,19 @@ inherited frmItemizedListList: TfrmItemizedListList
     end
   end
   object cxgrdpmn2: TcxGridPopupMenu
-    Grid = cxGrid2
     PopupMenus = <>
-    Left = 660
+    Left = 597
-    Top = 636
+    Top = 401
   end
   object CDS_WXTS: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 412
+    Left = 691
-    Top = 424
+    Top = 307
-  end
-  object PM_1: TPopupMenu
-    Left = 988
-    Top = 356
-    object N1: TMenuItem
-      Caption = #22797#21046
-      OnClick = N1Click
-    end
   end
   object GPM_3: TcxGridPopupMenu
     PopupMenus = <>
-    Left = 860
+    Left = 691
-    Top = 228
+    Top = 401
   end
 end

T02贸易汇总仓库/U_ItemizedListList.pas

@@ -28,9 +28,6 @@ type
     TBPrint: TToolButton;
     TBClose: TToolButton;
     Panel1: TPanel;
-    Tv1: TcxGridDBTableView;
-    cxGrid1Level1: TcxGridLevel;
-    cxGrid1: TcxGrid;
     cxgrdpmn1: TcxGridPopupMenu;
     ADOQueryCmd: TADOQuery;
     ADOQueryMain: TADOQuery;
@@ -38,44 +35,29 @@ type
     DataSource1: TDataSource;
     Label3: TLabel;
     TIMNo: TcxTextEdit;
-    v1OrdDate: TcxGridDBColumn;
     Order_Main: TClientDataSet;
     TBCK: TToolButton;
-    cxSplitter1: TcxSplitter;
     ADOQuerySub: TADOQuery;
-    DataSource2: TDataSource;
     ToolButton4: TToolButton;
     cxTabControl1: TcxTabControl;
     Tchk: TToolButton;
     Tnochk: TToolButton;
-    Panel2: TPanel;
     ADOQueryImage: TADOQuery;
     DSImage: TDataSource;
     IdFTP1: TIdFTP;
-    v1Column11: TcxGridDBColumn;
-    v1Column16: TcxGridDBColumn;
-    ORDER_SUB: TClientDataSet;
     PopupMenu2: TPopupMenu;
     N3: TMenuItem;
     N4: TMenuItem;
     Label1: TLabel;
     OOPCoName: TcxTextEdit;
-    Tv1Column6: TcxGridDBColumn;
     cxgrdpmn2: TcxGridPopupMenu;
-    Tv1Column2: TcxGridDBColumn;
-    Tv1Column10: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
-    Tv1Column1: TcxGridDBColumn;
     CDS_WXTS: TClientDataSet;
     ToolButton2: TToolButton;
-    PM_1: TPopupMenu;
-    N1: TMenuItem;
     N2: TMenuItem;
     GPM_3: TcxGridPopupMenu;
-    Tv1Column3: TcxGridDBColumn;
     frmFrameDateSel1: TfrmFrameDateSel;
-    cxGrid2: TcxGrid;
+    cxGrid1: TcxGrid;
-    TV2: TcxGridDBTableView;
+    TV1: TcxGridDBTableView;
     cxGridDBColumn2: TcxGridDBColumn;
     cxGridDBColumn3: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
@@ -88,8 +70,13 @@ type
     Tv1Column8: TcxGridDBColumn;
     cxGridDBColumn7: TcxGridDBColumn;
     cxGridDBColumn9: TcxGridDBColumn;
+    TV1Column1: TcxGridDBColumn;
+    TV1Column2: TcxGridDBColumn;
+    TV1Column3: TcxGridDBColumn;
+    TV1Column4: TcxGridDBColumn;
     cxGridLevel1: TcxGridLevel;
-    Tv1Column5: TcxGridDBColumn;
+    TV1Column5: TcxGridDBColumn;
+    ToolButton1: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -107,7 +94,6 @@ type
     procedure v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure TBCKClick(Sender: TObject);
     procedure TIMNoKeyPress(Sender: TObject; var Key: Char);
-    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
     procedure ToolButton4Click(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure TchkClick(Sender: TObject);
@@ -120,13 +106,12 @@ type
     procedure JGTypeChange(Sender: TObject);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
     procedure ToolButton2Click(Sender: TObject);
-    procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
     procedure InitForm();
-    procedure InitSub();
     procedure SetStatus();
     procedure InitImage(fwbid: string);
     procedure SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string);
@@ -191,28 +176,6 @@ begin
 
 end;
 
-procedure TfrmItemizedListList.InitSub();
-begin
-  ADOQuerySub.Close;
-  if Order_Main.IsEmpty then
-    exit;
-  ADOQuerySub.DisableControls;
-  with ADOQuerySub do
-  begin
-    close;
-    sql.Clear;
-    sql.Add('select *  ');
-    sql.Add(' from Trade_ItemizedList_Sub A');
-    sql.Add('where TIMId =' + quotedstr((Order_Main.fieldbyname('TIMId').AsString)));
-    open;
-  end;
-  SCreateCDS(ADOQuerySub, ORDER_SUB);
-  SInitCDSData(ADOQuerySub, ORDER_SUB);
-
-  ADOQuerySub.EnableControls;
-  TV2.DataController.Filter.Clear;
-end;
-
 procedure TfrmItemizedListList.JGTypeChange(Sender: TObject);
 begin
   InitGrid();
@@ -247,63 +210,27 @@ end;
 
 procedure TfrmItemizedListList.InitGrid();
 var
-  STRwhere, Pwhere: string;
+  SqlStr: string;
 begin
-  STRwhere := '';
-  Pwhere := SGetFilters(Panel1, 1, 2);
 
-  begin
+  SqlStr := ' select   *    from Trade_ItemizedList_Main A inner join  Trade_ItemizedList_Sub B on A.TIMId=B.TIMId ';
-    if trim(Pwhere) <> '' then
+
-      STRwhere := STRwhere + ' and ' + trim(Pwhere);
+  SqlStr := SqlStr + ' where A.TIMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)));
-  end;
+  SqlStr := SqlStr + ' and  A.TIMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)));
 
   case cxTabControl1.TabIndex of
     0:
       begin
-        STRwhere := STRwhere + ' and  isnull(status,''0'')=''0'' ';
+        SqlStr := SqlStr + ' and  isnull(status,''0'')=''0'' ';
       end;
     1:
       begin
-        STRwhere := STRwhere + ' and  isnull(status,''0'')=''9'' ';
+        SqlStr := SqlStr + ' and  isnull(status,''0'')=''9'' ';
       end;
   end;
+  SqlStr := SqlStr + ' order by  A.filltime desc';
 
-  try
+  InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'TISId');
-    ADOQueryMain.DisableControls;
-
-    with ADOQueryMain do
-    begin
-      Filtered := False;
-      Close;
-      sql.Clear;
-      sql.add(' select   *    ');
-      sql.Add(' ,HZPiQty=(select sum(TISPiece) from Trade_ItemizedList_Sub X where X.TIMId=A.TIMId)');
-      sql.Add(' ,OrdQty=(select sum(TISQty) from Trade_ItemizedList_Sub X where X.TIMId=A.TIMId)');
-      sql.Add(' ,OrdUnit=(select top 1 TISUnit from Trade_ItemizedList_Sub X where X.TIMId=A.TIMId)');
-
-      sql.add(' from Trade_ItemizedList_Main A  ');
-
-      sql.add(' where A.TIMDate>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date))));
-      sql.add(' and  A.TIMDate<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1))));
-
-      if canshu1 = '录入' then
-      begin
-        sql.add(' and  A.Filler= ' + QuotedStr(Trim(DName)));
-      end;
-      sql.add('     ' + STRwhere);
-
-      sql.add(' order by  filltime desc');
-//      ShowMessage(SQL.Text);
-      Open;
-    end;
-
-    SCreateCDS(ADOQueryMain, Order_Main);
-    SInitCDSData(ADOQueryMain, Order_Main);
-  finally
-    ADOQueryMain.EnableControls;
-    TV1.DataController.Filter.Clear;
-
-  end;
 end;
 
 procedure TfrmItemizedListList.SendMessageQR(MDateId, KeyWord1, KeyWord2, KeyWord3: string);
@@ -360,7 +287,6 @@ end;
 procedure TfrmItemizedListList.InitForm();
 begin
   ReadCxGrid('指示单列表FF1', Tv1, '生产指示单管理');
-  ReadCxGrid('指示单列表FFTv21', Tv2, '生产指示单管理');
   frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 180;
   frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
 
@@ -419,8 +345,8 @@ begin
       begin
         Close;
         Sql.Clear;
-        Sql.Add('exec P_Trade_Market_Sub_Del ');
+        Sql.Add('exec P_Trade_ItemizedList_Sub_Del ');
-        Sql.Add(' @TMSId=' + quotedstr(trim(Order_Main.FieldByName('TMSId').AsString)));
+        Sql.Add(' @TISId=' + quotedstr(trim(Order_Main.FieldByName('TISId').AsString)));
         Sql.Add(',@DCode=' + Quotedstr(DCode));
         Sql.Add(',@DName=' + Quotedstr(DName));
         Open;
@@ -615,12 +541,6 @@ begin
   Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 
-procedure TfrmItemizedListList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
-begin
-  InitSub();
-
-end;
-
 procedure TfrmItemizedListList.ToolButton4Click(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
@@ -716,14 +636,9 @@ begin
   end;
 end;
 
-procedure TfrmItemizedListList.N1Click(Sender: TObject);
-begin
-  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
-end;
-
 procedure TfrmItemizedListList.N2Click(Sender: TObject);
 begin
-  Clipboard.SetTextBuf(PChar(Trim(ORDER_SUB.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 
 procedure TfrmItemizedListList.N3Click(Sender: TObject);
@@ -752,14 +667,49 @@ end;
 procedure TfrmItemizedListList.ToolButton10Click(Sender: TObject);
 begin
   WriteCxGrid('指示单列表FF1', Tv1, '生产指示单管理');
-  WriteCxGrid('指示单列表FFTv21', Tv2, '生产指示单管理6');
   application.MessageBox('保存成功！', '提示信息', 0);
 end;
 
+procedure TfrmItemizedListList.ToolButton1Click(Sender: TObject);
+var
+  MFiltration: string;
+  MPrintJson: string;
+begin
+  if Order_Main.IsEmpty then
+    Exit;
+  if Order_Main.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('ûÓÐÑ¡ÔñÊý¾Ý!', 'Ìáʾ', 0);
+    Exit;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select Filtration= SUBSTRING(CAST((select distinct '','' +A.BCIOID from BS_Cloth_IO A    ');
+    sql.Add(' where A.IOFlag=''Èë¿â''     ');
+    sql.Add(' and  EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(SelCDSKey(Order_Main, ['TISId'])[0]) + ','','')  X where X.RTValue=A.TISId ) ');
+    sql.Add('  for xml path('''') ) AS VARCHAR(1000)) , 2, 1000)');
+//    ShowMessage(SQL.TEXT);
+    open;
+  end;
+
+  MFiltration := Trim(ADOQueryTemp.FieldByName('Filtration').AsString);
+
+  MPrintJson := '              {"LMType": "TradeFinishClothInPrt1"    ';
+  MPrintJson := MPrintJson + ' ,"PreviewPrint": true      ';
+  MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
+  MPrintJson := MPrintJson + '               { "IsSql": false, "Filtration":" ' + MFiltration + '"  } ] }    ';
+  FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
+end;
+
 procedure TfrmItemizedListList.ToolButton2Click(Sender: TObject);
 begin
   WriteCxGrid('指示单列表FF1', Tv1, '生产指示单管理');
-  WriteCxGrid('指示单列表FFTv21', Tv2, '生产指示单管理');
 end;
 
 end.

T02贸易汇总仓库/U_ItemizedListQtyInPut.pas

@@ -516,36 +516,35 @@ procedure TfrmItemizedListQtyInPut.inQtyKeyPress(Sender: TObject; var Key: Char)
 var
   i: Integer;
 begin
-//  if Key = #13 then
+  if Key = #13 then
-//  begin
+  begin
-//    with CDS_Sub do
+    with CDS_Sub do
-//    begin
+    begin
-//      DisableControls;
+      DisableControls;
-//      for i := 1 to StrToIntDef(inPiece.Text, 1) do
+      for i := 1 to StrToIntDef(inPiece.Text, 1) do
-//      begin
+      begin
-//        Append;
+        Append;
-//        FieldByName('Qty').Value := StrTofloatDef(inQty.Text, 0);
+
-//
+        if FQtyUnit = 'M' then
-//        if QtyUnit.Text = 'M' then
+        begin
-//        begin
+          FieldByName('Meter').Value := StrTofloatDef(inQty.Text, 0);
-//          FieldByName('Meter').Value := StrTofloatDef(inQty.Text, 0);
+        end
-//        end
+        else if FQtyUnit = 'Y' then
-//        else if QtyUnit.Text = 'Y' then
+        begin
-//        begin
+          FieldByName('Yardage').Value := StrTofloatDef(inQty.Text, 0);
-//          FieldByName('Yardage').Value := StrTofloatDef(inQty.Text, 0);
+        end
-//        end
+        else
-//        else
+        begin
-//        begin
+          FieldByName('NetWeight').Value := StrTofloatDef(inQty.Text, 0);
-//          FieldByName('NetWeight').Value := StrTofloatDef(inQty.Text, 0);
+        end;
-//        end;
+
-//
+        Post;
-//        Post;
+      end;
-//      end;
+      EnableControls;
-//      EnableControls;
+    end;
-//    end;
+    inPiece.Text := '1';
-//    inPiece.Text := '1';
+    inQty.Text := '';
-//    inQty.Text := '';
+  end;
-//  end;
 end;
 
 procedure TfrmItemizedListQtyInPut.TBDelClick(Sender: TObject);

T02贸易汇总仓库/U_TradeClothTotalInList.dfm

@@ -364,7 +364,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 150
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

T03贸易布匹检验/U_MachRollMain.dfm

@@ -26,9 +26,8 @@ inherited frmMachRollMain: TfrmMachRollMain
     LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
     OptionsItem.SizableHorz = True
     OptionsItem.SizableVert = True
+    OnClick = FrameKeyBoard1SpeedButton1Click
     OnDblClick = dxLayoutControl_packDblClick
-    ExplicitLeft = 5
-    ExplicitTop = -5
     object Qty: TcxTextEdit
       Left = 79
       Top = 154
@@ -929,9 +928,6 @@ inherited frmMachRollMain: TfrmMachRollMain
     Align = alClient
     Caption = 'Panel_right'
     TabOrder = 4
-    ExplicitLeft = 1037
-    ExplicitWidth = 252
-    ExplicitHeight = 791
     object ToolBar2: TToolBar
       Tag = 1000
       Left = 1
@@ -940,7 +936,7 @@ inherited frmMachRollMain: TfrmMachRollMain
       Height = 30
       AutoSize = True
       ButtonHeight = 30
-      ButtonWidth = 83
+      ButtonWidth = 99
       Caption = 'ToolBar1'
       EdgeInner = esNone
       EdgeOuter = esNone
@@ -957,7 +953,7 @@ inherited frmMachRollMain: TfrmMachRollMain
         OnClick = ToolButton3Click
       end
       object Trolldel: TToolButton
-        Left = 63
+        Left = 71
         Top = 0
         AutoSize = True
         Caption = #21024#38500
@@ -965,14 +961,14 @@ inherited frmMachRollMain: TfrmMachRollMain
         OnClick = TrolldelClick
       end
       object ToolButton4: TToolButton
-        Left = 126
+        Left = 142
         Top = 0
         AutoSize = True
         Caption = #30133#28857#31649#29702
         ImageIndex = 2
       end
       object ToolButton1: TToolButton
-        Left = 213
+        Left = 245
         Top = 0
         AutoSize = True
         Caption = #25171#21367#35774#32622
@@ -980,7 +976,7 @@ inherited frmMachRollMain: TfrmMachRollMain
         OnClick = ToolButton1Click
       end
       object ToolButton7: TToolButton
-        Left = 300
+        Left = 348
         Top = 0
         AutoSize = True
         Caption = #20445#23384#26684#24335
@@ -988,14 +984,14 @@ inherited frmMachRollMain: TfrmMachRollMain
         OnClick = ToolButton7Click
       end
       object Tlog: TToolButton
-        Left = 387
+        Left = 451
         Top = 0
         AutoSize = True
         Caption = #26085#24535
         ImageIndex = 30
       end
       object ToolButton8: TToolButton
-        Left = 450
+        Left = 522
         Top = 0
         AutoSize = True
         Caption = #20851#38381
@@ -1011,8 +1007,6 @@ inherited frmMachRollMain: TfrmMachRollMain
       Height = 819
       Align = alClient
       TabOrder = 1
-      ExplicitLeft = 0
-      ExplicitTop = 37
       object Tv3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -1169,13 +1163,56 @@ inherited frmMachRollMain: TfrmMachRollMain
       inherited dxPanel1: TdxPanel
         Width = 311
         Height = 206
-        ExplicitLeft = -228
-        ExplicitTop = 7
         ExplicitWidth = 311
         ExplicitHeight = 206
+        inherited SpeedButton1: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton4: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton7: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton2: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton5: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton8: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton3: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton6: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton9: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton_back: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton0: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton_dot: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
         inherited SpeedButton_yc: TSpeedButton
           OnClick = FrameKeyBoard1SpeedButton_ycClick
         end
+        inherited SpeedButton_zdykey2: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton_zdykey1: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
+        inherited SpeedButton10: TSpeedButton
+          OnClick = FrameKeyBoard1SpeedButton1Click
+        end
       end
     end
     object MovePanel1: TMovePanel
@@ -1360,33 +1397,6 @@ inherited frmMachRollMain: TfrmMachRollMain
     Left = 818
     Top = 270
   end
-  object RM1: TRMGridReport
-    ThreadPrepareReport = True
-    InitialZoom = pzDefault
-    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
-    DefaultCollate = False
-    ShowPrintDialog = False
-    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
-    PreviewOptions.RulerUnit = rmutScreenPixels
-    PreviewOptions.RulerVisible = False
-    PreviewOptions.DrawBorder = False
-    PreviewOptions.BorderPen.Color = clGray
-    PreviewOptions.BorderPen.Style = psDash
-    Dataset = RMDB_1
-    CompressLevel = rmzcFastest
-    CompressThread = False
-    LaterBuildEvents = True
-    OnlyOwnerDataSet = False
-    Left = 536
-    Top = 552
-    ReportData = {}
-  end
-  object RMDB_1: TRMDBDataSet
-    Visible = True
-    DataSet = ADOQueryPrint
-    Left = 442
-    Top = 552
-  end
   object GPM_3: TcxGridPopupMenu
     Grid = cxGrid3
     PopupMenus = <>
@@ -1406,10 +1416,6 @@ inherited frmMachRollMain: TfrmMachRollMain
     Left = 818
     Top = 458
   end
-  object RMRichObject1: TRMRichObject
-    Left = 630
-    Top = 552
-  end
   object ADO_CJ: TADOQuery
     Connection = DataLink_TradeInsp.ADOLink
     LockType = ltReadOnly
@@ -1417,4 +1423,88 @@ inherited frmMachRollMain: TfrmMachRollMain
     Left = 442
     Top = 364
   end
+  object fRMDB_1: TfrxDBDataset
+    UserName = 'fRMDB_1'
+    CloseDataSource = False
+    DataSet = ADOQueryPrint
+    BCDToCurrency = False
+    Left = 1030
+    Top = 385
+  end
+  object frxReport1: TfrxReport
+    Version = '6.9.12'
+    DataSet = fRMDB_1
+    DataSetName = 'fRMDB_1'
+    DotMatrixReport = False
+    IniFile = '\Software\Fast Reports'
+    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
+    PreviewOptions.Zoom = 1.000000000000000000
+    PrintOptions.Printer = 'Default'
+    PrintOptions.PrintOnSheet = 0
+    ReportOptions.CreateDate = 45471.682319444440000000
+    ReportOptions.LastChange = 45471.682319444440000000
+    ScriptLanguage = 'PascalScript'
+    ScriptText.Strings = (
+      'begin'
+      ''
+      'end.')
+    ShowProgress = False
+    Left = 989
+    Top = 425
+    Datasets = <>
+    Variables = <>
+    Style = <>
+    object Data: TfrxDataPage
+      Height = 1000.000000000000000000
+      Width = 1000.000000000000000000
+    end
+    object Page1: TfrxReportPage
+      PaperWidth = 70.000000000000000000
+      PaperHeight = 50.000000000000000000
+      PaperSize = 256
+      LeftMargin = 10.000000000000000000
+      RightMargin = 10.000000000000000000
+      TopMargin = 10.000000000000000000
+      BottomMargin = 10.000000000000000000
+      Frame.Typ = []
+      MirrorMode = []
+    end
+  end
+  object frxPPTXExport1: TfrxPPTXExport
+    UseFileCache = True
+    ShowProgress = True
+    OverwritePrompt = False
+    DataOnly = False
+    OpenAfterExport = False
+    PictureType = gpPNG
+    Left = 925
+    Top = 500
+  end
+  object frxXLSXExport1: TfrxXLSXExport
+    UseFileCache = True
+    ShowProgress = True
+    OverwritePrompt = False
+    DataOnly = False
+    ChunkSize = 0
+    OpenAfterExport = False
+    PictureType = gpPNG
+    Left = 944
+    Top = 565
+  end
+  object frxReportTableObject1: TfrxReportTableObject
+    Left = 1013
+    Top = 484
+  end
+  object frxOLEObject1: TfrxOLEObject
+    Left = 1093
+    Top = 548
+  end
+  object frxRichObject1: TfrxRichObject
+    Left = 1133
+    Top = 492
+  end
+  object frxBarCodeObject1: TfrxBarCodeObject
+    Left = 1173
+    Top = 420
+  end
 end

T03贸易布匹检验/U_MachRollMain.pas

@@ -16,7 +16,9 @@ uses
   RM_Common, RM_Class, RM_GridReport, cxCheckBox, cxMaskEdit, cxDropDownEdit,
   Vcl.Menus, cxButtonEdit, RM_Dataset, cxGeometry, dxFramedControl, dxPanel,
   U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel,
-  RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore;
+  RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, frxBarcode, frxRich,
+  frxOLE, frxTableObject, frxExportXLSX, frxClass, frxExportBaseDialog,
+  frxExportPPTX, frxDBSet;
 
 type
   TfrmMachRollMain = class(TfrmBaseList)
@@ -103,7 +105,6 @@ type
     ADOQueryMain: TADOQuery;
     cds_paramsoutPage: TStringField;
     ADOQueryPrint: TADOQuery;
-    RM1: TRMGridReport;
     cds_paramsEndPieceNo: TIntegerField;
     cds_paramsBeginPieceNo: TIntegerField;
     cds_paramsFixedLength: TIntegerField;
@@ -116,7 +117,6 @@ type
     cds_paramsLabPackage: TStringField;
     dxLayoutItem_packnote: TdxLayoutItem;
     packnote: TcxMemo;
-    RMDB_1: TRMDBDataSet;
     Tlog: TToolButton;
     cxGroupBox_keys: TcxGroupBox;
     FrameKeyBoard1: TFrameKeyBoard;
@@ -133,7 +133,6 @@ type
     ADOQueryImage: TADOQuery;
     DS_IMAGE: TDataSource;
     cds_paramspackPrintPreview: TBooleanField;
-    RMRichObject1: TRMRichObject;
     cds_paramspacklabNumber: TIntegerField;
     cds_paramspackPostAction: TStringField;
     customStrField1: TcxTextEdit;
@@ -168,6 +167,14 @@ type
     Tv3Grade: TcxGridDBColumn;
     tv3CIID: TcxGridDBColumn;
     cxGridLevel2: TcxGridLevel;
+    fRMDB_1: TfrxDBDataset;
+    frxReport1: TfrxReport;
+    frxPPTXExport1: TfrxPPTXExport;
+    frxXLSXExport1: TfrxXLSXExport;
+    frxReportTableObject1: TfrxReportTableObject;
+    frxOLEObject1: TfrxOLEObject;
+    frxRichObject1: TfrxRichObject;
+    frxBarCodeObject1: TfrxBarCodeObject;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -190,6 +197,7 @@ type
     procedure bt_printmdClick(Sender: TObject);
     procedure dxLayoutControl_packDblClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
+    procedure FrameKeyBoard1SpeedButton1Click(Sender: TObject);
   private
     FCIID, FCIFName, FWorkshop: string;
     FBCIOID, FQtyUnit, FLenUnit: string;
@@ -223,7 +231,6 @@ type
 
     procedure BadSpeedButtonClick(Sender: TObject);
     procedure setFormCtrol();
-    procedure PrtMD(MInNo: string);
     procedure On1201(var Message: Tmessage); message 1201; // 电子称
     procedure On1301(var Message: Tmessage); message 1301; // 码表
     function CheckData(CKType: string): Boolean;
@@ -314,18 +321,10 @@ begin
     BTPrint.Enabled := false;
 
     edtScan.SetFocus;
-    if trim(OrderNo.Text) = '' then
-      exit;
 
     if CheckData('提交') = false then
       exit;
 
-    if FCDUnit <> lblLenUnit.CaptionOptions.Hint then
-    begin
-      Application.MessageBox('单位与计划单设置不符!', '提示', 0);
-      exit;
-    end;
-
     if SaveData() then
     begin
       InputLen.Text := '';
@@ -478,6 +477,46 @@ begin
   end;
 end;
 
+procedure TfrmMachRollMain.FrameKeyBoard1SpeedButton1Click(Sender: TObject);
+var
+  fsj: string;
+  mComponent: TComponent;
+  mkey: Char;
+begin
+  fsj := trim(TSpeedButton(Sender).Hint);
+  if trim(fsj) = '' then
+    exit;
+  mComponent := FindComponent(trim(TSpeedButton(Sender).Hint));
+
+  if mComponent = nil then
+    exit;
+  if TcxTextEdit(mComponent).Name = 'KuangHao' then
+    exit;
+  if (TcxTextEdit(mComponent).Name = 'edtScan') and (trim(TSpeedButton(Sender).Caption) = '回车') then
+  begin
+    mkey := #13;
+    edtScanKeyPress(edtScan, mkey);
+    exit;
+  end;
+  fsj := trim(TcxTextEdit(mComponent).Text);
+  if mComponent is TcxCurrencyEdit then
+  begin
+    TcxCurrencyEdit(mComponent).text := fsj + trim(TSpeedButton(Sender).Caption);
+    TcxCurrencyEdit(mComponent).SelectAll;
+  end
+  else if mComponent is TcxTextEdit then
+  begin
+    TcxTextEdit(mComponent).Text := fsj + trim(TSpeedButton(Sender).Caption);
+    TcxTextEdit(mComponent).SelectAll;
+  end
+  else if mComponent is TcxComboBox then
+  begin
+    TcxComboBox(mComponent).Text := fsj + trim(TSpeedButton(Sender).Caption);
+    TcxComboBox(mComponent).SelectAll;
+  end;
+
+end;
+
 procedure TfrmMachRollMain.FrameKeyBoard1SpeedButton_ycClick(Sender: TObject);
 begin
   inherited;
@@ -578,7 +617,7 @@ begin
       end;
 
       fLabPackage := '默认包标签';
-      fLabVolume := '默认标签';
+      fLabVolume := '标签打印';
 
 
 //      fLabPackage := trim(ADOQueryBaseTemp.fieldbyName('LabPackage').AsString);
@@ -591,34 +630,36 @@ begin
       FBCIOID := trim(fieldbyName('BCIOID').AsString);
 
       FQtyUnit := trim(fieldbyName('QtyUnit').AsString);
-
+      OrderNo.Text := trim(fieldbyName('FromOrdNo').AsString);
+      CodeName.Text := trim(fieldbyName('C_Name').AsString);
       C_width.Text := trim(fieldbyName('C_width').AsString);
       C_GramWeight.Text := trim(fieldbyName('C_GramWeight').AsString);
-
+      ColorNo.Text := trim(fieldbyName('C_ColorNo').AsString);
+      Color.Text := trim(fieldbyName('C_Color').AsString);
       C_Pattern.Text := trim(fieldbyName('C_Pattern').AsString);
       FFtyPCId := trim(fieldbyName('FtyPCId').AsString);
 
+      cds_params.Edit;
       cds_params.fieldbyName('outPage').value := '√';
-
       cds_params.Post;
 
-      Coefficient.Text := trim(fieldbyName('Coefficient').AsString);
+//      Coefficient.Text := trim(fieldbyName('Coefficient').AsString);
 
       // 转换系数
-      lblRuleConversion.ItemIndex := lblRuleConversion.Properties.Items.IndexOf(fieldbyName('RuleConversion').AsString);
+//      lblRuleConversion.ItemIndex := lblRuleConversion.Properties.Items.IndexOf(fieldbyName('RuleConversion').AsString);
 
       FtyPCId.Text := FFtyPCId;
       BCIOID.Text := FBCIOID;
 
-      Qty.Text := trim(fieldbyName('Qty').AsString) + trim(fieldbyName('QtyUnit').AsString);
+      Qty.Text := trim(fieldbyName('StkQty').AsString) + trim(fieldbyName('QtyUnit').AsString);
 
-      Tare.Text := trim(fieldbyName('RuleLaterTare').AsString);
+//      Tare.Text := trim(fieldbyName('RuleLaterTare').AsString);
 
       fTareType := '';
 
-      if fieldbyName('RuleYardstick').AsInteger > 0 then
+//      if fieldbyName('RuleYardstick').AsInteger > 0 then
-        RuleYardstick.Text := trim(fieldbyName('RuleYardstick').AsString)
+//        RuleYardstick.Text := trim(fieldbyName('RuleYardstick').AsString)
-      else
+//      else
       RuleYardstick.Text := '100';
 
       packnote.Lines.Clear;
@@ -715,53 +756,26 @@ end;
 
 procedure TfrmMachRollMain.TrolldelClick(Sender: TObject);
 var
-  mCiid: string;
+  MBCIOID: string;
 begin
   if cds_3.IsEmpty then
     exit;
-  if Trim(cds_3.FieldByName('packetid').AsString) <> '' then
+
-  begin
-    if Application.MessageBox(pchar('确定要删除选择的整个包【' + Trim(cds_3.FieldByName('packetNo').AsString) + '】的卷数据吗？'), '提示', 32 + 4) <> IDYES then
-      exit;
-    deletePack(Trim(cds_3.FieldByName('packetid').AsString));
-    exit;
-  end
-  else
-  begin
   if Application.MessageBox('确定要删除选择的卷数据吗？', '提示', 32 + 4) <> IDYES then
     exit;
-  end;
+
   ADOQueryBaseCmd.Connection.BeginTrans;
   try
-    mCiid := trim(cds_3.fieldbyName('CIID').AsString);
+    MBCIOID := trim(cds_3.fieldbyName('BCIOID').AsString);
-    with ADOQueryBaseTemp do
-    begin
-      Close;
-      SQL.Clear;
-      SQL.Add('select * from BS_Cloth_IO where StkId=''' + trim(mCiid) + ''' and IOFlag=''入库''');
-      Open;
 
-      if not IsEmpty then
-      begin
-        Application.MessageBox('已产生入库数据不能操作!', '提示', 0);
-        exit;
-      end;
-    end;
     with ADOQueryBaseCmd do
     begin
       Close;
       SQL.Clear;
-      SQL.Add('insert into Trade_Need_Up(UType,UOperation,UDataId,uoperator) values(''检验'',''检验删除'',' + QuotedStr(mCiid) + ',' + QuotedStr(DName) + ')  ');
+      Sql.Add('exec P_BS_Cloth_Out_Del ');
-      ExecSQL;
+      Sql.Add(' @BCIOIDS=' + quotedstr(MBCIOID));
-    end;
+      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
-    with ADOQueryBaseCmd do
+      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
-    begin
-      Close;
-      SQL.Clear;
-      SQL.Add('exec P_Trade_Insp_Del ');
-      SQL.Add('@CIIDS=' + QuotedStr(mCiid));
-      SQL.Add(',@DCode=' + QuotedStr(DCode));
-      SQL.Add(',@DName=' + QuotedStr(DName));
       Open;
     end;
     if ADOQueryBaseCmd.fieldbyName('intReturn').AsInteger = -1 then
@@ -769,14 +783,6 @@ begin
       raise Exception.create(pchar(trim(ADOQueryBaseCmd.fieldbyName('ShowMsg').AsString)));
     end;
     ADOQueryBaseCmd.Connection.CommitTrans;
-    if (FPacketCount > 0) and (ansipos(mCiid, FPacketCIID) > 0) then
-    begin
-      FPacketCount := FPacketCount - 1;
-      FPacketCIID := FPacketCIID.Replace(mCiid, '');
-      if FPacketCIID = ',' then
-        FPacketCIID := '';
-
-    end;
 
     cds_3.Delete;
     Application.MessageBox('删除成功！', '提示信息');
@@ -1164,7 +1170,6 @@ begin
   end;
 end;
 
-//
 procedure TfrmMachRollMain.PrtData(MCIID: string; againPring: Boolean = false);
 var
   fPrintFile: string;
@@ -1177,8 +1182,8 @@ begin
   begin
     Close;
     SQL.Clear;
-    SQL.Add(' EXEC P_Trade_Print_Lab ');
+    SQL.Add(' EXEC P_BS_Cloth_Prt2 ');
-    SQL.Add(' @CIID=''' + trim(MCIID) + '''');
+    SQL.Add(' @Filtration=''' + trim(MCIID) + '''');
     Open;
   end;
   if ADOQueryPrint.IsEmpty then
@@ -1187,44 +1192,32 @@ begin
     exit;
   end;
 
-  if trim(ADOQueryPrint.fieldbyName('SLabVolume').AsString) <> '' then
+//  if trim(ADOQueryPrint.fieldbyName('SLabVolume').AsString) <> '' then
-    fLabVolume := trim(ADOQueryPrint.fieldbyName('SLabVolume').AsString)
+//    fLabVolume := trim(ADOQueryPrint.fieldbyName('SLabVolume').AsString)
-  else
+//  else
-    fLabVolume := trim(ADOQueryPrint.fieldbyName('LabVolume').AsString);
+//    fLabVolume := trim(ADOQueryPrint.fieldbyName('LabVolume').AsString);
+
   if fLabVolume = '' then
   begin
     Application.MessageBox('订单还未设置标签！', '提示信息', MB_ICONERROR);
     exit;
   end;
 
-  ExportFtErpFile(fLabVolume + '.rmf', ADOQueryBaseTemp);
+  ExportFtErpFile(fLabVolume + '.fr3', ADOQueryBaseTemp);
-  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + fLabVolume + '.rmf';
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + fLabVolume + '.fr3';
-
   if FileExists(fPrintFile) then
   begin
-    RM1.LoadFromFile(fPrintFile);
-   // if trim(ADOQueryPrint.fieldbyName('LabVolume').AsString) <> '次品标签' then
-    RM1.DefaultCopies := cds_params.fieldbyName('labNumber').AsInteger;
-   // else
-   //   RM1.DefaultCopies := 1;
-    RM1.PrintReport;
 
-    //
+    frxReport1.LoadFromFile(fPrintFile);
-    if againPring then
+    frxReport1.PrintOptions.Copies := cds_params.fieldbyName('labNumber').AsInteger;
-    begin
+    frxReport1.PrintOptions.ShowDialog := false;
-      with ADOQueryBaseCmd do
+    frxReport1.PrepareReport(True);
-      begin
+    frxReport1.Print();
-        Close;
-        SQL.Clear;
-        SQL.Add('insert into Trade_Need_Up(UType,UOperation,UDataId,uoperator) values(''检验'',''重打卷标签'',' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)) + ',' + QuotedStr(DName) + ')  ');
-        ExecSQL;
-      end;
-    end;
 
   end
   else
   begin
-    Application.MessageBox(pchar('没有找' + fPrintFile), '提示', 0);
+    Application.MessageBox(PChar('没有找到' + fPrintFile), '提示', 0);
   end;
 end;
 
@@ -1275,36 +1268,6 @@ begin
 
 end;
 
-procedure TfrmMachRollMain.PrtMD(MInNo: string);
-var
-  fPrintFile, FLBName: string;
-begin
-  with ADOQueryPrint do
-  begin
-    Close;
-    SQL.Clear;
-    SQL.Add(' EXEC P_Trade_Cloth_In_Prt11 ');
-    SQL.Add(' @Filtration=''' + trim(MInNo) + '''');
-    Open;
-  end;
-
-  FLBName := '机台检验入库单';
-
-  ExportFtErpFile(FLBName + '.rmf', ADOQueryBaseTemp);
-  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLBName + '.rmf';
-
-  if FileExists(fPrintFile) then
-  begin
-    RM1.LoadFromFile(fPrintFile);
-    RM1.DefaultCopies := cds_params.fieldbyName('labNumber').AsInteger;
-    RM1.PrintReport;
-  end
-  else
-  begin
-    Application.MessageBox(pchar('没有找' + fPrintFile), '提示', 0);
-  end;
-end;
-
 
 /////////////////////////////////////
 function TfrmMachRollMain.deletePack(packId: string): boolean;