diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dpr b/T02贸易汇总仓库/TradeTotalClothStk.dpr
index e045a9e..15864fa 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dpr
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dpr
@@ -38,7 +38,7 @@ uses
U_TradeFtyClothOutList in 'U_TradeFtyClothOutList.pas' {frmTradeFtyClothOutList},
U_TradeFtyClothOutEdit in 'U_TradeFtyClothOutEdit.pas' {frmTradeFtyClothOutEdit},
U_TradeFtyClothStkList in 'U_TradeFtyClothStkList.pas' {frmTradeFtyClothStkList},
- U_TradeClothTotalStkList in 'U_TradeClothTotalStkList.pas' {frmTradeClothTotalStkList},
+ U_TradeXinYuStkList in 'U_TradeXinYuStkList.pas' {frmTradeXinYuStkList},
U_TradePackClothInList in 'U_TradePackClothInList.pas' {frmTradePackClothInList},
U_TradePackClothOutList in 'U_TradePackClothOutList.pas' {frmTradePackClothOutList},
U_TradePackClothStkList in 'U_TradePackClothStkList.pas' {frmTradePackClothStkList},
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj b/T02贸易汇总仓库/TradeTotalClothStk.dproj
index 652a1e9..4b68693 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj
@@ -237,8 +237,8 @@
dfm
-
-
+
+
dfm
diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas
index e5858f2..b509858 100644
--- a/T02贸易汇总仓库/U_GetDllForm.pas
+++ b/T02贸易汇总仓库/U_GetDllForm.pas
@@ -23,7 +23,7 @@ uses
U_TradeSampleClothOutList, U_TradeSampleClothStkList, U_ClothPurchaseEnterList,
U_ClothScheduleList, U_TradeClothTotalStkList, U_TradeClothTotalInList,
U_TradeClothTotalOutList, U_TradeDeliveryRequest, U_TradeRRList,
- U_ItemizedListList;
+ U_ItemizedListList, U_TradeXinYuStkList;
/////////////////////////////////////////////////////////////////
// ˵:ȡDllеô //
@@ -216,7 +216,15 @@ begin
mnewHandle := Handle;
end;
end;
-
+ 924: //
+ begin
+ with TfrmTradeXinYuStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do //
+ begin
+ fFormID := FormID;
+ WindowState := mstate;
+ mnewHandle := Handle;
+ end;
+ end;
511: //
begin
with TfrmTradeSampleClothInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do //
diff --git a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
index f97ec34..2c8a47a 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalStkList.dfm
@@ -183,7 +183,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
Height = 426
Align = alClient
TabOrder = 4
- Properties.ActivePage = cxTabSheet2
+ Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
Properties.Style = 5
OnChange = cxPageControl1Change
@@ -799,54 +799,54 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
end
inherited ADOQueryBaseCmd: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
- Left = 171
- Top = 356
+ Left = 524
+ Top = 181
end
inherited ADOQueryBaseTemp: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
- Left = 313
- Top = 337
+ Left = 606
+ Top = 181
end
object ADOQueryCmd: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
Parameters = <>
- Left = 397
- Top = 380
+ Left = 688
+ Top = 181
end
object ADO_2: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 720
- Top = 317
+ Left = 524
+ Top = 243
end
object ADOQueryTemp: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 304
- Top = 176
+ Left = 770
+ Top = 181
end
object DS_1: TDataSource
DataSet = CDS_1
- Left = 648
- Top = 264
+ Left = 524
+ Top = 305
end
object GPM_1: TcxGridPopupMenu
Grid = cxGrid1
PopupMenus = <>
- Left = 512
- Top = 264
+ Left = 770
+ Top = 243
end
object CDS_1: TClientDataSet
Aggregates = <>
Params = <>
- Left = 576
- Top = 264
+ Left = 606
+ Top = 243
end
object PopupMenu1: TPopupMenu
- Left = 304
- Top = 256
+ Left = 688
+ Top = 305
object N1: TMenuItem
Caption = #20840#36873
OnClick = N1Click
@@ -859,25 +859,25 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
object GPM_2: TcxGridPopupMenu
Grid = cxGrid2
PopupMenus = <>
- Left = 512
- Top = 320
+ Left = 852
+ Top = 243
end
object CDS_2: TClientDataSet
Aggregates = <>
Params = <>
- Left = 576
- Top = 320
+ Left = 688
+ Top = 243
end
object DS_2: TDataSource
DataSet = CDS_2
- Left = 640
- Top = 320
+ Left = 606
+ Top = 305
end
object ADO_1: TADOQuery
Connection = DataLink_TradeTotalClothStk.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 720
- Top = 269
+ Left = 852
+ Top = 181
end
end
diff --git a/T02贸易汇总仓库/U_TradeXinYuStkList.dfm b/T02贸易汇总仓库/U_TradeXinYuStkList.dfm
new file mode 100644
index 0000000..d120ae4
--- /dev/null
+++ b/T02贸易汇总仓库/U_TradeXinYuStkList.dfm
@@ -0,0 +1,367 @@
+inherited frmTradeXinYuStkList: TfrmTradeXinYuStkList
+ Left = 105
+ Top = 131
+ Caption = #26032#20313#24211#23384
+ ClientHeight = 515
+ ClientWidth = 1404
+ Color = clBtnFace
+ Font.Height = -16
+ FormStyle = fsMDIChild
+ Position = poDefault
+ Visible = True
+ ExplicitWidth = 1420
+ ExplicitHeight = 554
+ PixelsPerInch = 96
+ TextHeight = 21
+ object ToolBar1: TToolBar [0]
+ Tag = 1
+ Left = 0
+ Top = 0
+ Width = 1404
+ Height = 30
+ AutoSize = True
+ ButtonHeight = 30
+ ButtonWidth = 83
+ Caption = 'ToolBar1'
+ Color = clSkyBlue
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -12
+ Font.Name = #23435#20307
+ Font.Style = []
+ Images = DataLink_TradeTotalClothStk.cxImageList_bar
+ List = True
+ ParentColor = False
+ ParentFont = False
+ ShowCaptions = True
+ TabOrder = 2
+ object TBRafresh: TToolButton
+ Left = 0
+ Top = 0
+ AutoSize = True
+ Caption = #21047#26032
+ ImageIndex = 1
+ OnClick = TBRafreshClick
+ end
+ object TBFind: TToolButton
+ Left = 63
+ Top = 0
+ AutoSize = True
+ Caption = #36807#28388
+ ImageIndex = 0
+ Visible = False
+ OnClick = TBFindClick
+ end
+ object ToolButton3: TToolButton
+ Left = 126
+ Top = 0
+ AutoSize = True
+ Caption = #26631#31614#25171#21360
+ ImageIndex = 21
+ end
+ object ToolButton2: TToolButton
+ Left = 213
+ Top = 0
+ AutoSize = True
+ Caption = #20445#23384#26684#24335
+ ImageIndex = 16
+ OnClick = ToolButton2Click
+ end
+ object TBClose: TToolButton
+ Left = 300
+ Top = 0
+ AutoSize = True
+ Caption = #20851#38381
+ ImageIndex = 7
+ OnClick = TBCloseClick
+ end
+ end
+ object Panel1: TPanel [1]
+ Left = 0
+ Top = 30
+ Width = 1404
+ Height = 59
+ Align = alTop
+ BevelInner = bvRaised
+ BevelOuter = bvLowered
+ ParentBackground = False
+ ParentColor = True
+ TabOrder = 3
+ object Label3: TLabel
+ Left = 28
+ Top = 18
+ Width = 32
+ Height = 21
+ Caption = #21697#21517
+ end
+ object Label4: TLabel
+ Left = 598
+ Top = 18
+ Width = 32
+ Height = 21
+ Caption = #32534#21495
+ end
+ object Label2: TLabel
+ Left = 408
+ Top = 18
+ Width = 32
+ Height = 21
+ Caption = #39068#33394
+ end
+ object Label6: TLabel
+ Left = 218
+ Top = 18
+ Width = 32
+ Height = 21
+ Caption = #33394#21495
+ end
+ object C_name: TcxTextEdit
+ Tag = 2
+ Left = 64
+ Top = 14
+ Properties.OnChange = FromCoNamePropertiesChange
+ TabOrder = 0
+ OnKeyPress = C_CodeKeyPress
+ Width = 150
+ end
+ object C_Code: TcxTextEdit
+ Tag = 2
+ Left = 634
+ Top = 14
+ Properties.OnChange = FromCoNamePropertiesChange
+ TabOrder = 1
+ OnKeyPress = C_CodeKeyPress
+ Width = 150
+ end
+ object C_Color: TcxTextEdit
+ Tag = 2
+ Left = 444
+ Top = 14
+ Properties.OnChange = FromCoNamePropertiesChange
+ TabOrder = 2
+ OnKeyPress = C_CodeKeyPress
+ Width = 150
+ end
+ object C_ColorNo: TcxTextEdit
+ Tag = 2
+ Left = 254
+ Top = 14
+ Properties.OnChange = FromCoNamePropertiesChange
+ TabOrder = 3
+ OnKeyPress = C_CodeKeyPress
+ Width = 150
+ end
+ end
+ inherited cxProgressBar2: TcxProgressBar
+ Left = 461
+ Top = 353
+ ExplicitLeft = 461
+ ExplicitTop = 353
+ ExplicitHeight = 29
+ end
+ object cxGrid2: TcxGrid [4]
+ Left = 0
+ Top = 89
+ Width = 1404
+ Height = 426
+ Align = alClient
+ PopupMenu = PopupMenu1
+ TabOrder = 4
+ ExplicitTop = 8
+ ExplicitHeight = 394
+ object TV2: TcxGridDBTableView
+ Navigator.Buttons.CustomButtons = <>
+ ScrollbarAnnotations.CustomAnnotations = <>
+ DataController.DataSource = DS_2
+ DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+ DataController.Summary.DefaultGroupSummaryItems = <
+ item
+ Kind = skSum
+ Position = spFooter
+ end>
+ DataController.Summary.FooterSummaryItems = <
+ item
+ Kind = skCount
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn16
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skSum
+ end
+ item
+ Kind = skCount
+ end
+ item
+ Kind = skSum
+ Column = cxGridDBColumn15
+ end>
+ DataController.Summary.SummaryGroups = <>
+ OptionsCustomize.ColumnFiltering = False
+ OptionsView.Footer = True
+ OptionsView.GroupByBox = False
+ OptionsView.GroupFooters = gfAlwaysVisible
+ OptionsView.IndicatorWidth = 40
+ object cxGridDBColumn14: TcxGridDBColumn
+ Caption = #32534#21495
+ DataBinding.FieldName = 'C_Code'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn9: TcxGridDBColumn
+ Tag = 2
+ Caption = #21697#21517
+ DataBinding.FieldName = 'C_Name'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxButtonEditProperties'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn24: TcxGridDBColumn
+ Caption = #39068#33394
+ DataBinding.FieldName = 'C_Color'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn26: TcxGridDBColumn
+ Caption = #33394#21495
+ DataBinding.FieldName = 'C_ColorNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn29: TcxGridDBColumn
+ Caption = #33457#22411
+ DataBinding.FieldName = 'C_Pattern'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn17: TcxGridDBColumn
+ Tag = 2
+ Caption = #21333#20301
+ DataBinding.FieldName = 'QtyUnit'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxComboBoxProperties'
+ Properties.DropDownListStyle = lsFixedList
+ Properties.Items.Strings = (
+ 'Kg'
+ 'M'
+ 'Y')
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn28: TcxGridDBColumn
+ Caption = #31867#22411
+ DataBinding.FieldName = 'C_Degree'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn15: TcxGridDBColumn
+ Caption = #21305#25968
+ DataBinding.FieldName = 'StkPieceint'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ object cxGridDBColumn16: TcxGridDBColumn
+ Tag = 2
+ Caption = #25968#37327
+ DataBinding.FieldName = 'StkQty'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxTextEditProperties'
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 77
+ end
+ end
+ object cxGridLevel1: TcxGridLevel
+ GridView = TV2
+ end
+ end
+ inherited ADOQueryBaseCmd: TADOQuery
+ Connection = DataLink_TradeTotalClothStk.ADOLink
+ Left = 524
+ Top = 181
+ end
+ inherited ADOQueryBaseTemp: TADOQuery
+ Connection = DataLink_TradeTotalClothStk.ADOLink
+ Left = 606
+ Top = 181
+ end
+ object ADOQueryCmd: TADOQuery
+ Connection = DataLink_TradeTotalClothStk.ADOLink
+ Parameters = <>
+ Left = 688
+ Top = 181
+ end
+ object ADO_2: TADOQuery
+ Connection = DataLink_TradeTotalClothStk.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 524
+ Top = 243
+ end
+ object ADOQueryTemp: TADOQuery
+ Connection = DataLink_TradeTotalClothStk.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 770
+ Top = 181
+ end
+ object PopupMenu1: TPopupMenu
+ Left = 688
+ Top = 305
+ object N1: TMenuItem
+ Caption = #20840#36873
+ end
+ object N2: TMenuItem
+ Caption = #20840#24323
+ end
+ end
+ object GPM_2: TcxGridPopupMenu
+ PopupMenus = <>
+ Left = 852
+ Top = 243
+ end
+ object CDS_2: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 688
+ Top = 243
+ end
+ object DS_2: TDataSource
+ DataSet = CDS_2
+ Left = 606
+ Top = 305
+ end
+end
diff --git a/T02贸易汇总仓库/U_TradeXinYuStkList.pas b/T02贸易汇总仓库/U_TradeXinYuStkList.pas
new file mode 100644
index 0000000..8a49e2a
--- /dev/null
+++ b/T02贸易汇总仓库/U_TradeXinYuStkList.pas
@@ -0,0 +1,177 @@
+unit U_TradeXinYuStkList;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+ Vcl.Printers, Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
+ cxDataStorage, cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+ cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
+ cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
+ ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
+ cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
+ RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
+ cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
+ dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer,
+ cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters,
+ cxPC;
+
+type
+ TfrmTradeXinYuStkList = class(TfrmBaseList)
+ ToolBar1: TToolBar;
+ TBRafresh: TToolButton;
+ TBFind: TToolButton;
+ TBClose: TToolButton;
+ Panel1: TPanel;
+ ADOQueryCmd: TADOQuery;
+ ADO_2: TADOQuery;
+ ADOQueryTemp: TADOQuery;
+ PopupMenu1: TPopupMenu;
+ Label3: TLabel;
+ Label4: TLabel;
+ Label2: TLabel;
+ C_name: TcxTextEdit;
+ C_Code: TcxTextEdit;
+ C_Color: TcxTextEdit;
+ ToolButton2: TToolButton;
+ Label6: TLabel;
+ C_ColorNo: TcxTextEdit;
+ N1: TMenuItem;
+ N2: TMenuItem;
+ ToolButton3: TToolButton;
+ GPM_2: TcxGridPopupMenu;
+ CDS_2: TClientDataSet;
+ DS_2: TDataSource;
+ cxGrid2: TcxGrid;
+ TV2: TcxGridDBTableView;
+ cxGridDBColumn14: TcxGridDBColumn;
+ cxGridDBColumn9: TcxGridDBColumn;
+ cxGridDBColumn15: TcxGridDBColumn;
+ cxGridDBColumn16: TcxGridDBColumn;
+ cxGridDBColumn24: TcxGridDBColumn;
+ cxGridDBColumn26: TcxGridDBColumn;
+ cxGridDBColumn28: TcxGridDBColumn;
+ cxGridDBColumn29: TcxGridDBColumn;
+ cxGridDBColumn17: TcxGridDBColumn;
+ cxGridLevel1: TcxGridLevel;
+ procedure FormDestroy(Sender: TObject);
+ procedure FormClose(Sender: TObject; var Action: TCloseAction);
+ procedure TBRafreshClick(Sender: TObject);
+ procedure TBCloseClick(Sender: TObject);
+ procedure FormShow(Sender: TObject);
+ procedure TBFindClick(Sender: TObject);
+ procedure MPRTCodeNameChange(Sender: TObject);
+ procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+ procedure ToolButton2Click(Sender: TObject);
+ procedure FromCoNamePropertiesChange(Sender: TObject);
+ procedure FormCreate(Sender: TObject);
+ procedure C_CodeKeyPress(Sender: TObject; var Key: Char);
+ private
+ canshu1, FSTKName, canshu3, canshu4: string;
+ procedure InitGrid2();
+ { Private declarations }
+ public
+ { Public declarations }
+ end;
+
+var
+ frmTradeXinYuStkList: TfrmTradeXinYuStkList;
+
+implementation
+
+uses
+ U_DataLink, U_RTFun, U_PrintLabFun, U_dynamicsDll, U_printPdf,
+ U_TradeClothSplit, U_LabelPrint;
+
+{$R *.dfm}
+
+procedure TfrmTradeXinYuStkList.FormDestroy(Sender: TObject);
+begin
+ inherited;
+ frmTradeXinYuStkList := nil;
+end;
+
+procedure TfrmTradeXinYuStkList.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+ inherited;
+ Action := caFree;
+end;
+
+procedure TfrmTradeXinYuStkList.FormCreate(Sender: TObject);
+begin
+ inherited;
+ canshu1 := Trim(self.fParameters1);
+ FSTKName := Trim(self.fParameters2);
+ canshu3 := Trim(self.fParameters3);
+ canshu4 := Trim(self.fParameters4);
+end;
+
+procedure TfrmTradeXinYuStkList.InitGrid2();
+var
+ SqlStr: string;
+begin
+
+ SqlStr := ' EXEC P_BS_Cloth_Xinyu_Stk';
+
+// ShowMessage(SqlStr);
+ InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
+
+end;
+
+procedure TfrmTradeXinYuStkList.TBRafreshClick(Sender: TObject);
+begin
+ InitGrid2();
+end;
+
+procedure TfrmTradeXinYuStkList.TBCloseClick(Sender: TObject);
+begin
+
+ Close;
+end;
+
+procedure TfrmTradeXinYuStkList.FormShow(Sender: TObject);
+begin
+ inherited;
+
+ ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'óֿܲ');
+ canshu4 := Trim(self.fParameters4);
+ InitGrid2();
+end;
+
+procedure TfrmTradeXinYuStkList.C_CodeKeyPress(Sender: TObject; var Key: Char);
+begin
+ if Key = #13 then
+ TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuStkList.FromCoNamePropertiesChange(Sender: TObject);
+begin
+ if Length(Trim(TcxTextEdit(Sender).Text)) < 4 then
+ Exit;
+ TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuStkList.TBFindClick(Sender: TObject);
+begin
+
+ CDSDataFilter(ADO_2, CDS_2, Tv2, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, ' {"EquTag": 1,"LikeTag": 2,"Fields": "C_name|C_Color|C_ColorNo"}') + '" }');
+
+end;
+
+procedure TfrmTradeXinYuStkList.MPRTCodeNameChange(Sender: TObject);
+begin
+ TBFind.Click;
+end;
+
+procedure TfrmTradeXinYuStkList.ToolButton2Click(Sender: TObject);
+begin
+ WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'óֿܲ');
+end;
+
+procedure TfrmTradeXinYuStkList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+ ModalResult := 1;
+end;
+
+end.
+
diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm
index 5d53347..b758284 100644
--- a/T05贸易门市管理/U_TradeMarketInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut.dfm
@@ -2,14 +2,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Left = 143
Top = 4
Caption = #35746#21333#24405#20837
- ClientHeight = 652
+ ClientHeight = 699
ClientWidth = 1913
Font.Charset = GB2312_CHARSET
Font.Height = -16
Position = poMainFormCenter
WindowState = wsMaximized
ExplicitWidth = 1929
- ExplicitHeight = 691
+ ExplicitHeight = 738
PixelsPerInch = 96
TextHeight = 21
object ToolBar1: TToolBar [0]
@@ -89,25 +89,29 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Left = 0
Top = 209
Width = 1913
- Height = 443
+ Height = 490
Align = alClient
Caption = 'Panel2'
TabOrder = 2
+ ExplicitHeight = 443
object Panel3: TPanel
Left = 1
Top = 1
Width = 1625
- Height = 441
+ Height = 488
Align = alClient
Caption = 'Panel2'
TabOrder = 0
+ ExplicitHeight = 441
object cxGrid1: TcxGrid
Left = 1
Top = 1
Width = 1623
- Height = 439
+ Height = 486
Align = alClient
TabOrder = 0
+ ExplicitLeft = -1
+ ExplicitTop = -1
object Tv1: TcxGridDBTableView
OnMouseDown = Tv1MouseDown
Navigator.Buttons.CustomButtons = <>
@@ -154,7 +158,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
DataBinding.FieldName = 'SerialNo'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object v1Column11: TcxGridDBColumn
Tag = 99
@@ -166,7 +170,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Properties.NullStyle = nssUnchecked
HeaderAlignmentHorz = taCenter
Options.Sorting = False
- Width = 55
+ Width = 77
end
object Tv1Column1: TcxGridDBColumn
Caption = #20135#21697#32534#21495
@@ -181,7 +185,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Properties.OnButtonClick = Tv1Column1PropertiesButtonClick
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 55
+ Width = 77
end
object Tv1Column7: TcxGridDBColumn
Caption = #33394#24067#21517#31216
@@ -199,7 +203,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Properties.ListSource = DS_PM
Properties.OnEditValueChanged = Tv1Column7PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object v1PRTColor: TcxGridDBColumn
Caption = #39068#33394
@@ -214,7 +218,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Properties.ReadOnly = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 55
+ Width = 77
end
object Tv1Column12: TcxGridDBColumn
Caption = #33394#21495
@@ -236,42 +240,42 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Properties.ListSource = DS_YS
Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column9: TcxGridDBColumn
Caption = #35268#26684
DataBinding.FieldName = 'C_Spec'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column11: TcxGridDBColumn
Caption = #33457#22411
DataBinding.FieldName = 'C_Pattern'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column5: TcxGridDBColumn
Caption = #38376#24133
DataBinding.FieldName = 'C_Width'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column10: TcxGridDBColumn
Caption = #20811#37325
DataBinding.FieldName = 'C_GramWeight'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column15: TcxGridDBColumn
Caption = #25253#21333#25968#37327
DataBinding.FieldName = 'OrderQty'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column16: TcxGridDBColumn
Caption = #25253#21333#21333#20301
@@ -286,7 +290,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
end>
Properties.ListSource = DS_DanWei
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column8: TcxGridDBColumn
Caption = #24211#23384#21333#20301
@@ -294,35 +298,35 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
- Width = 55
+ Width = 77
end
object Tv1Column4: TcxGridDBColumn
Caption = #21333#20215
DataBinding.FieldName = 'Price'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column6: TcxGridDBColumn
Caption = #21253#32568#36153
DataBinding.FieldName = 'GangFee'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column13: TcxGridDBColumn
Caption = #36816#36153
DataBinding.FieldName = 'Transfee'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column14: TcxGridDBColumn
Caption = #20854#23427#36153
DataBinding.FieldName = 'Otherfee'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column17: TcxGridDBColumn
Caption = #32039#24613#31243#24230
@@ -334,14 +338,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
#27491#24120
#32039#24613)
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column2: TcxGridDBColumn
Caption = #22791#27880
DataBinding.FieldName = 'OrdSNote'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
object Tv1Column18: TcxGridDBColumn
Caption = #22791#36135#29366#24577
@@ -356,7 +360,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
#27424#21333
#21462#28040#21333)
HeaderAlignmentHorz = taCenter
- Width = 55
+ Width = 77
end
end
object cxGrid1Level1: TcxGridLevel
@@ -368,10 +372,11 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Left = 1626
Top = 1
Width = 286
- Height = 441
+ Height = 488
Align = alRight
Caption = 'Panel4'
TabOrder = 1
+ ExplicitHeight = 441
object Panel5: TPanel
Left = 1
Top = 1
@@ -405,17 +410,19 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Left = 1
Top = 42
Width = 284
- Height = 398
+ Height = 445
Align = alClient
Caption = #21452#20987#21024#38500#26126#32454#20449#24687
TabOrder = 1
+ ExplicitHeight = 398
object cxGrid2: TcxGrid
Left = 2
Top = 23
Width = 280
- Height = 373
+ Height = 420
Align = alClient
TabOrder = 0
+ ExplicitHeight = 373
object TvMX: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
Navigator.Buttons.Delete.Enabled = False
@@ -488,6 +495,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
ParentCtl3D = False
TabOrder = 3
OnClick = ScrollBox1Click
+ ExplicitTop = 24
object Label3: TLabel
Left = 730
Top = 70
@@ -694,70 +702,70 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
end
inherited ADOQueryBaseCmd: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
- Left = 584
- Top = 188
+ Left = 860
+ Top = 157
end
inherited ADOQueryBaseTemp: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
- Left = 666
- Top = 188
+ Left = 942
+ Top = 157
end
inherited ImageList_new32: TImageList
- Left = 748
- Top = 436
+ Left = 1024
+ Top = 467
end
inherited cxImageList_bar: TcxImageList
FormatVersion = 1
- Left = 830
- Top = 312
- DesignInfo = 20448062
+ Left = 1024
+ Top = 343
+ DesignInfo = 22479872
end
object ADOTemp: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 830
- Top = 188
+ Left = 1106
+ Top = 157
end
object ADOCmd: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
Parameters = <>
- Left = 502
- Top = 188
+ Left = 778
+ Top = 157
end
object DS_1: TDataSource
DataSet = CDS_1
- Left = 502
- Top = 374
+ Left = 1106
+ Top = 343
end
object CDS_1: TClientDataSet
Aggregates = <>
Params = <>
- Left = 584
- Top = 312
+ Left = 1024
+ Top = 281
end
object GPM_1: TcxGridPopupMenu
Grid = cxGrid1
PopupMenus = <>
- Left = 748
- Top = 312
+ Left = 860
+ Top = 343
end
object ADOQueryLabel: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
Parameters = <>
- Left = 748
- Top = 188
+ Left = 1024
+ Top = 157
end
object ADO_I1: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
Parameters = <>
- Left = 584
- Top = 250
+ Left = 942
+ Top = 219
end
object DS_I1: TDataSource
DataSet = ADO_I1
- Left = 584
- Top = 374
+ Left = 860
+ Top = 405
end
object IdFTP1: TIdFTP
ConnectTimeout = 0
@@ -767,103 +775,103 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
ProxySettings.ProxyType = fpcmNone
ProxySettings.Port = 0
ReadTimeout = 0
- Left = 666
- Top = 436
+ Left = 942
+ Top = 467
end
object ADO_I2: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
Parameters = <>
- Left = 666
- Top = 250
+ Left = 1024
+ Top = 219
end
object DS_I2: TDataSource
DataSet = ADO_I2
- Left = 666
- Top = 374
+ Left = 942
+ Top = 405
end
object DS_MX: TDataSource
DataSet = CDS_MX
- Left = 748
- Top = 374
+ Left = 1024
+ Top = 405
end
object CDS_MX: TClientDataSet
Aggregates = <>
Params = <>
- Left = 666
- Top = 312
+ Left = 778
+ Top = 343
end
object ADO_YS: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 502
- Top = 312
+ Left = 942
+ Top = 281
end
object DS_YS: TDataSource
DataSet = ADO_YS
- Left = 584
- Top = 436
+ Left = 860
+ Top = 467
end
object DS_RCPM: TDataSource
DataSet = ADO_RCPM
- Left = 502
- Top = 436
+ Left = 778
+ Top = 467
end
object ADO_PM: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 748
- Top = 250
+ Left = 778
+ Top = 281
end
object ADO_RCPM: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 830
- Top = 250
+ Left = 860
+ Top = 281
end
object DS_PM: TDataSource
DataSet = ADO_PM
- Left = 830
- Top = 374
+ Left = 1106
+ Top = 405
end
object ADO_1: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 502
- Top = 250
+ Left = 778
+ Top = 219
end
object CDS_KH: TClientDataSet
Aggregates = <>
Params = <>
- Left = 312
- Top = 376
+ Left = 1106
+ Top = 281
end
object ADO_KH: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 214
- Top = 346
+ Left = 1106
+ Top = 219
end
object GPM_2: TcxGridPopupMenu
Grid = cxGrid2
PopupMenus = <>
- Left = 876
- Top = 496
+ Left = 942
+ Top = 343
end
object DS_DanWei: TDataSource
DataSet = ADO_DanWei
- Left = 664
- Top = 564
+ Left = 778
+ Top = 405
end
object ADO_DanWei: TADOQuery
Connection = DataLink_TradeMarket.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 502
- Top = 536
+ Left = 860
+ Top = 219
end
end
diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas
index 16bddd2..358bb1d 100644
--- a/T05贸易门市管理/U_TradeMarketInPut.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut.pas
@@ -186,7 +186,6 @@ begin
if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then
begin
- ADOCmd.Connection.RollbackTrans;
Application.MessageBox('ȡˮʧܣ', 'ʾ', 0);
Exit;
end;
@@ -196,7 +195,6 @@ begin
FieldByName('SerialNo').Value := IntToStr(i);
FieldByName('TMSId').Value := Trim(maxno);
FieldByName('TMSPiece').Value := 0;
-
FieldByName('TMSQty').Value := 0;
Post;
end;
diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm
index b0530f0..6dbdcd8 100644
--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@@ -3,13 +3,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList
Top = 13
Caption = #22823#36135#21333
ClientHeight = 594
- ClientWidth = 1791
+ ClientWidth = 1985
Color = clBtnFace
Font.Height = -16
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitWidth = 1807
+ ExplicitWidth = 2001
ExplicitHeight = 633
PixelsPerInch = 96
TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
Tag = 1
Left = 0
Top = 0
- Width = 1791
+ Width = 1985
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -27,6 +27,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
List = True
ShowCaptions = True
TabOrder = 4
+ ExplicitWidth = 1791
object TBRafresh: TToolButton
Left = 0
Top = 0
@@ -167,13 +168,14 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object Panel1: TPanel [1]
Left = 0
Top = 30
- Width = 1791
+ Width = 1985
Height = 91
Align = alTop
BevelInner = bvRaised
BevelOuter = bvLowered
ParentBackground = False
TabOrder = 5
+ ExplicitWidth = 1791
object Label3: TLabel
Left = 24
Top = 51
@@ -237,7 +239,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
inline frmFrameDateSel1: TfrmFrameDateSel
Left = 2
Top = 2
- Width = 1787
+ Width = 1981
Height = 37
Align = alTop
Color = clWhite
@@ -259,11 +261,12 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object cxGrid1: TcxGrid [2]
Left = 0
Top = 152
- Width = 1791
+ Width = 1985
Height = 442
Align = alClient
PopupMenu = PM_1
TabOrder = 3
+ ExplicitWidth = 1791
object Tv1: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
@@ -485,7 +488,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object cxTabControl1: TcxTabControl [3]
Left = 0
Top = 121
- Width = 1791
+ Width = 1985
Height = 31
Align = alTop
TabOrder = 2
@@ -499,8 +502,9 @@ inherited frmTradeMarketList: TfrmTradeMarketList
' '#24050#23436#25104' '
' '#20840#37096' ')
OnChange = cxTabControl1Change
+ ExplicitWidth = 1791
ClientRectBottom = 31
- ClientRectRight = 1791
+ ClientRectRight = 1985
ClientRectTop = 28
end
inherited loadProcess: TPanel