From 3fad37784ff37bb92282f7b51bae0f340a8a73b2 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 15 Jul 2025 10:37:37 +0800 Subject: [PATCH] 1 --- A01基础公司管理/U_CustInput.dfm | 26 +- A01基础公司管理/U_CustInput.pas | 21 +- A01基础公司管理/U_Customer.dfm | 9 +- A01基础公司管理/U_Customer.pas | 19 +- A01基础公司管理/U_DataLink.pas | 41 +-- T03贸易布匹检验/U_MachRollMain.dfm | 456 +++++++++++++------------ T03贸易布匹检验/U_MachRollMain.pas | 39 +-- T05贸易门市管理/U_GetDllForm.pas | 3 +- T05贸易门市管理/U_TradeMarketInPut.dfm | 74 ++-- T05贸易门市管理/U_TradeMarketInPut.pas | 70 +++- 10 files changed, 402 insertions(+), 356 deletions(-) diff --git a/A01基础公司管理/U_CustInput.dfm b/A01基础公司管理/U_CustInput.dfm index 38b33ad..8535ca6 100644 --- a/A01基础公司管理/U_CustInput.dfm +++ b/A01基础公司管理/U_CustInput.dfm @@ -190,6 +190,13 @@ inherited frmCustInput: TfrmCustInput Height = 21 Caption = #38656#35201#30422#31456 end + object Label16: TLabel + Left = 878 + Top = 164 + Width = 32 + Height = 21 + Caption = #38376#24215 + end object CoName: TcxTextEdit Tag = 2 Left = 86 @@ -363,7 +370,7 @@ inherited frmCustInput: TfrmCustInput Left = 950 Top = 125 TabOrder = 13 - Width = 125 + Width = 200 end object area: TcxMRUEdit Left = 1278 @@ -406,6 +413,17 @@ inherited frmCustInput: TfrmCustInput Text = #21542 Width = 200 end + object Stores: TcxComboBox + Tag = 2 + Left = 950 + Top = 160 + Properties.DropDownListStyle = lsFixedList + Properties.Items.Strings = ( + #26684#32654 + #26032#20313) + TabOrder = 17 + Width = 200 + end end object Panel1: TPanel [2] Left = 0 @@ -415,8 +433,6 @@ inherited frmCustInput: TfrmCustInput Align = alClient Caption = 'Panel1' TabOrder = 2 - ExplicitTop = 285 - ExplicitHeight = 388 object Panel3: TPanel Left = 1 Top = 1 @@ -425,7 +441,6 @@ inherited frmCustInput: TfrmCustInput Align = alClient Caption = 'Panel1' TabOrder = 0 - ExplicitHeight = 386 object ToolBar3: TToolBar Tag = 1 Left = 1 @@ -476,7 +491,6 @@ inherited frmCustInput: TfrmCustInput Align = alClient BorderStyle = cxcbsNone TabOrder = 1 - ExplicitHeight = 354 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -590,7 +604,6 @@ inherited frmCustInput: TfrmCustInput Align = alRight Caption = 'Panel1' TabOrder = 1 - ExplicitHeight = 386 object cxGrid1: TcxGrid Left = 1 Top = 31 @@ -599,7 +612,6 @@ inherited frmCustInput: TfrmCustInput Align = alClient BorderStyle = cxcbsNone TabOrder = 0 - ExplicitHeight = 354 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas index 949f95f..8c1b783 100644 --- a/A01基础公司管理/U_CustInput.pas +++ b/A01基础公司管理/U_CustInput.pas @@ -15,23 +15,8 @@ uses cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, System.ImageList, Vcl.ImgList, cxContainer, cxMemo, dxScrollbarAnnotations, dxSkinsCore, - dxSkinsDefaultPainters, cxImageList, cxMRUEdit, dxSkinBasic, dxSkinBlack, - dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, - dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, - dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, - dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, - dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, - dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, - dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, - dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, - dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark, - dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray, - dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, - dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust, - dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine, - dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark, - dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI, - dxSkinXmas2008Blue; + dxSkinsDefaultPainters, cxImageList, cxMRUEdit, dxSkinOffice2013White, + dxSkinSharpPlus, dxSkinWXI; type TfrmCustInput = class(TfrmBaseInput) @@ -108,6 +93,8 @@ type Label15: TLabel; MoreFlag: TcxComboBox; SealFlag: TcxComboBox; + Label16: TLabel; + Stores: TcxComboBox; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A01基础公司管理/U_Customer.dfm b/A01基础公司管理/U_Customer.dfm index 2b57ae6..8df81ae 100644 --- a/A01基础公司管理/U_Customer.dfm +++ b/A01基础公司管理/U_Customer.dfm @@ -9,7 +9,6 @@ inherited frmCustomer: TfrmCustomer FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -381 ExplicitWidth = 1556 ExplicitHeight = 576 PixelsPerInch = 96 @@ -399,6 +398,14 @@ inherited frmCustomer: TfrmCustomer HeaderAlignmentHorz = taCenter Width = 96 end + object Tv1Column13: TcxGridDBColumn + Caption = #38376#24215 + DataBinding.FieldName = 'Stores' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 58 + end end object cxGridLevel1: TcxGridLevel GridView = Tv1 diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas index 3c17cf3..ce51fd2 100644 --- a/A01基础公司管理/U_Customer.pas +++ b/A01基础公司管理/U_Customer.pas @@ -18,23 +18,7 @@ uses FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Stan.Async, FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Comp.Client, cxContainer, dxScrollbarAnnotations, Vcl.Menus, dxSkinsCore, dxSkinsDefaultPainters, - cxProgressBar, dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, - dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, - dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, - dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, - dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, - dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, - dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, - dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, - dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, - dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark, - dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray, - dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, - dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust, - dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine, - dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark, - dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI, - dxSkinXmas2008Blue; + cxProgressBar, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinWXI; type TfrmCustomer = class(TfrmBaseList) @@ -116,6 +100,7 @@ type Tv2Column3: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A01基础公司管理/U_DataLink.pas b/A01基础公司管理/U_DataLink.pas index c2d2420..7d6405d 100644 --- a/A01基础公司管理/U_DataLink.pas +++ b/A01基础公司管理/U_DataLink.pas @@ -4,42 +4,11 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, - Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, - System.ImageList, Vcl.ExtCtrls, SyncObjs, - U_BaseDataLink, cxImageList, cxGraphics, cxEdit, cxContainer, dxSkinsForm, - cxLocalization, - - - - - - - - - - - - - - - - dxCore, dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, - dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, - dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, - dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, - dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, - dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, - dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful, - dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful, - dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, - dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, - dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, - dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue, - dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010, - dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue; + Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, System.ImageList, + Vcl.ExtCtrls, SyncObjs, U_BaseDataLink, cxImageList, cxGraphics, cxEdit, + cxContainer, dxSkinsForm, cxLocalization, dxCore, dxLayoutLookAndFeels, + dxSkinsCore, dxSkinsDefaultPainters, dxSkinOffice2013White, dxSkinSharpPlus, + dxSkinWXI; type TMyThread = class(TThread) diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm index ca5d76e..90da83c 100644 --- a/T03贸易布匹检验/U_MachRollMain.dfm +++ b/T03贸易布匹检验/U_MachRollMain.dfm @@ -1,13 +1,12 @@ inherited frmMachRollMain: TfrmMachRollMain Caption = #26426#21488#26816#39564 ClientHeight = 756 - ClientWidth = 1791 + ClientWidth = 1443 Color = clBtnFace Font.Charset = ANSI_CHARSET Font.Height = -16 FormStyle = fsMDIChild - Visible = True - ExplicitWidth = 1807 + ExplicitWidth = 1459 ExplicitHeight = 795 PixelsPerInch = 96 TextHeight = 21 @@ -563,228 +562,23 @@ inherited frmMachRollMain: TfrmMachRollMain object Panel_right: TPanel [1] Left = 499 Top = 0 - Width = 1292 + Width = 944 Height = 756 Align = alClient Caption = 'Panel_right' + DoubleBuffered = False + ParentDoubleBuffered = False TabOrder = 3 - object ToolBar2: TToolBar - Tag = 1000 - Left = 1 - Top = 451 - Width = 1290 - Height = 30 - Align = alBottom - AutoSize = True - ButtonHeight = 30 - ButtonWidth = 131 - Caption = 'ToolBar1' - EdgeInner = esNone - EdgeOuter = esNone - Images = DataLink_TradeInsp.cxImageList_bar - List = True - ShowCaptions = True - TabOrder = 0 - object ToolButton3: TToolButton - Left = 0 - Top = 0 - AutoSize = True - Caption = #37325#25171 - ImageIndex = 21 - OnClick = ToolButton3Click - end - object Trolldel: TToolButton - Left = 71 - Top = 0 - AutoSize = True - Caption = #21024#38500 - ImageIndex = 5 - OnClick = TrolldelClick - end - object ToolButton4: TToolButton - Left = 142 - Top = 0 - AutoSize = True - Caption = #30133#28857#31649#29702 - ImageIndex = 2 - end - object ToolButton2: TToolButton - Left = 245 - Top = 0 - AutoSize = True - Caption = #25171#21360#24211#23384#26631#31614 - ImageIndex = 21 - OnClick = ToolButton2Click - end - object ToolButton1: TToolButton - Left = 380 - Top = 0 - AutoSize = True - Caption = #25171#21367#35774#32622 - ImageIndex = 25 - OnClick = ToolButton1Click - end - object Tlog: TToolButton - Left = 483 - Top = 0 - AutoSize = True - Caption = #26085#24535 - ImageIndex = 30 - end - object ToolButton8: TToolButton - Left = 554 - Top = 0 - AutoSize = True - Caption = #20851#38381 - ImageIndex = 7 - OnClick = ToolButton8Click - end - end - object cxGrid3: TcxGrid - Tag = 9999 - Left = 1 - Top = 481 - Width = 1290 - Height = 274 - Align = alBottom - TabOrder = 1 - object Tv3: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - OnCustomDrawCell = Tv3CustomDrawCell - DataController.DataSource = ds_3 - DataController.Filter.AutoDataSetFilter = True - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = < - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - Column = v3GrossWeight - end - item - Kind = skSum - Column = v3NetWeight - end - item - Format = #21367#25968':0' - Kind = skCount - Column = tv3CIID - end - item - Kind = skSum - end - item - Kind = skSum - Column = Tv3Yardage - end - item - Kind = skSum - Column = Tv3Meter - end - item - Kind = skSum - end - item - Kind = skCount - Column = v3PieceNo - end - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - end> - DataController.Summary.SummaryGroups = <> - OptionsCustomize.ColumnFiltering = False - OptionsView.Footer = True - OptionsView.GroupByBox = False - object v3PieceNo: TcxGridDBColumn - Caption = #21367#21495 - DataBinding.FieldName = 'PieceNo' - DataBinding.IsNullValueType = True - FixedKind = fkLeftDynamic - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 71 - end - object Tv3Yardage: TcxGridDBColumn - Caption = #30721#25968 - DataBinding.FieldName = 'Yardage' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 69 - end - object Tv3Meter: TcxGridDBColumn - Caption = #31859#25968 - DataBinding.FieldName = 'Meter' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object v3NetWeight: TcxGridDBColumn - Caption = #20928#37325 - DataBinding.FieldName = 'NetWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Sorting = False - Width = 62 - end - object v3GrossWeight: TcxGridDBColumn - Caption = #27611#37325 - DataBinding.FieldName = 'GrossWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Sorting = False - Width = 61 - end - object Tv3Grade: TcxGridDBColumn - Caption = #31561#32423 - DataBinding.FieldName = 'Grade' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 54 - end - object tv3CIID: TcxGridDBColumn - Caption = #21367#26465#30721 - DataBinding.FieldName = 'BCIOID' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Sorting = False - Width = 112 - end - end - object cxGridLevel2: TcxGridLevel - GridView = Tv3 - end - end + ExplicitWidth = 1292 object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 1290 - Height = 450 + Width = 942 + Height = 421 Align = alClient - TabOrder = 2 + TabOrder = 0 + ExplicitWidth = 1290 + ExplicitHeight = 450 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -941,6 +735,233 @@ inherited frmMachRollMain: TfrmMachRollMain GridView = TV2 end end + object Panel2: TPanel + Left = 1 + Top = 422 + Width = 942 + Height = 333 + Align = alBottom + TabOrder = 1 + ExplicitWidth = 1290 + object cxGrid3: TcxGrid + Tag = 9999 + Left = 1 + Top = 31 + Width = 940 + Height = 301 + Align = alClient + TabOrder = 0 + ExplicitLeft = 6 + ExplicitTop = 487 + ExplicitWidth = 1290 + ExplicitHeight = 274 + object Tv3: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + OnCustomDrawCell = Tv3CustomDrawCell + DataController.DataSource = ds_3 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + Column = v3GrossWeight + end + item + Kind = skSum + Column = v3NetWeight + end + item + Format = #21367#25968':0' + Kind = skCount + Column = tv3CIID + end + item + Kind = skSum + end + item + Kind = skSum + Column = Tv3Yardage + end + item + Kind = skSum + Column = Tv3Meter + end + item + Kind = skSum + end + item + Kind = skCount + Column = v3PieceNo + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + object v3PieceNo: TcxGridDBColumn + Caption = #21367#21495 + DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True + FixedKind = fkLeftDynamic + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 71 + end + object Tv3Yardage: TcxGridDBColumn + Caption = #30721#25968 + DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 69 + end + object Tv3Meter: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 79 + end + object v3NetWeight: TcxGridDBColumn + Caption = #20928#37325 + DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Sorting = False + Width = 62 + end + object v3GrossWeight: TcxGridDBColumn + Caption = #27611#37325 + DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Sorting = False + Width = 61 + end + object Tv3Grade: TcxGridDBColumn + Caption = #31561#32423 + DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 54 + end + object tv3CIID: TcxGridDBColumn + Caption = #21367#26465#30721 + DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Sorting = False + Width = 112 + end + end + object cxGridLevel2: TcxGridLevel + GridView = Tv3 + end + end + object ToolBar2: TToolBar + Tag = 1000 + Left = 1 + Top = 1 + Width = 940 + Height = 30 + AutoSize = True + ButtonHeight = 30 + ButtonWidth = 131 + Caption = 'ToolBar1' + DoubleBuffered = False + EdgeInner = esNone + EdgeOuter = esNone + Images = DataLink_TradeInsp.cxImageList_bar + List = True + ParentDoubleBuffered = False + ShowCaptions = True + TabOrder = 1 + ExplicitLeft = 5 + ExplicitTop = 6 + ExplicitWidth = 1288 + object ToolButton3: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #37325#25171 + ImageIndex = 21 + OnClick = ToolButton3Click + end + object Trolldel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + OnClick = TrolldelClick + end + object ToolButton4: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #30133#28857#31649#29702 + ImageIndex = 2 + end + object ToolButton2: TToolButton + Left = 245 + Top = 0 + AutoSize = True + Caption = #25171#21360#24211#23384#26631#31614 + ImageIndex = 21 + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 356 + Top = 0 + AutoSize = True + Caption = #25171#21367#35774#32622 + ImageIndex = 25 + OnClick = ToolButton1Click + end + object Tlog: TToolButton + Left = 459 + Top = 0 + AutoSize = True + Caption = #26085#24535 + ImageIndex = 30 + end + object ToolButton8: TToolButton + Left = 530 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = ToolButton8Click + end + end + end end object cxGroupBox_keys: TcxGroupBox [2] Left = 83 @@ -1202,7 +1223,6 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 311 end object GPM_3: TcxGridPopupMenu - Grid = cxGrid3 PopupMenus = <> Left = 456 Top = 411 diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas index cfba3aa..42e2899 100644 --- a/T03贸易布匹检验/U_MachRollMain.pas +++ b/T03贸易布匹检验/U_MachRollMain.pas @@ -23,11 +23,6 @@ uses type TfrmMachRollMain = class(TfrmBaseList) Panel_right: TPanel; - ToolBar2: TToolBar; - ToolButton3: TToolButton; - Trolldel: TToolButton; - ToolButton4: TToolButton; - ToolButton8: TToolButton; cds_params: TClientDataSet; cds_paramsdabao: TStringField; cds_paramspackRolls: TIntegerField; @@ -61,7 +56,6 @@ type cds_paramspieceOrder: TBooleanField; cds_paramsLabVolume: TStringField; cds_paramsLabPackage: TStringField; - Tlog: TToolButton; cxGroupBox_keys: TcxGroupBox; FrameKeyBoard1: TFrameKeyBoard; cds_paramsAddwetPresent: TFloatField; @@ -74,17 +68,6 @@ type cds_paramspacklabNumber: TIntegerField; cds_paramspackPostAction: TStringField; ADO_CJ: TADOQuery; - ToolButton1: TToolButton; - cxGrid3: TcxGrid; - Tv3: TcxGridDBTableView; - v3PieceNo: TcxGridDBColumn; - Tv3Yardage: TcxGridDBColumn; - Tv3Meter: TcxGridDBColumn; - v3NetWeight: TcxGridDBColumn; - v3GrossWeight: TcxGridDBColumn; - Tv3Grade: TcxGridDBColumn; - tv3CIID: TcxGridDBColumn; - cxGridLevel2: TcxGridLevel; fRMDB_1: TfrxDBDataset; frxReport1: TfrxReport; frxPPTXExport1: TfrxPPTXExport; @@ -93,7 +76,6 @@ type frxOLEObject1: TfrxOLEObject; frxRichObject1: TfrxRichObject; frxBarCodeObject1: TfrxBarCodeObject; - ToolButton2: TToolButton; cxGrid2: TcxGrid; TV2: TcxGridDBTableView; cxGridDBColumn1: TcxGridDBColumn; @@ -156,6 +138,25 @@ type cxDBImage1: TcxDBImage; Button1: TButton; TV2Column8: TcxGridDBColumn; + Panel2: TPanel; + cxGrid3: TcxGrid; + Tv3: TcxGridDBTableView; + v3PieceNo: TcxGridDBColumn; + Tv3Yardage: TcxGridDBColumn; + Tv3Meter: TcxGridDBColumn; + v3NetWeight: TcxGridDBColumn; + v3GrossWeight: TcxGridDBColumn; + Tv3Grade: TcxGridDBColumn; + tv3CIID: TcxGridDBColumn; + cxGridLevel2: TcxGridLevel; + ToolBar2: TToolBar; + ToolButton3: TToolButton; + Trolldel: TToolButton; + ToolButton4: TToolButton; + ToolButton2: TToolButton; + ToolButton1: TToolButton; + Tlog: TToolButton; + ToolButton8: TToolButton; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -427,6 +428,7 @@ begin Sql.Add(' ,@TMSId =' + quotedstr(MTMSId)); Sql.Add(' ,@Dcode=' + quotedstr(Trim(Dcode))); Sql.Add(' ,@DName=' + quotedstr(Trim(DName))); + showmessage(sql.Text); open; end; @@ -488,7 +490,6 @@ begin gIsCanDesign := gIsCanDesign; gGridNativeSet := true; -// InitDevCombobox(ADOQueryBaseTemp, grade, 'CPGRADE'); ReadCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption); if IsINIFile() then diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas index 6491e3e..9416679 100644 --- a/T05贸易门市管理/U_GetDllForm.pas +++ b/T05贸易门市管理/U_GetDllForm.pas @@ -76,7 +76,8 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DParameters1:='Ȩ'; // Parameters2 := '֯'; - + DCode := 'ADMIN'; + DName := 'ADMIN'; end else begin diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index 988e593..abe0bea 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -108,8 +108,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 439 Align = alClient TabOrder = 0 - ExplicitLeft = -1 - ExplicitTop = 5 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -156,7 +154,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut DataBinding.FieldName = 'SerialNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 50 + Width = 55 end object v1Column11: TcxGridDBColumn Tag = 99 @@ -168,7 +166,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter Options.Sorting = False - Width = 66 + Width = 55 end object Tv1Column1: TcxGridDBColumn Caption = #20135#21697#32534#21495 @@ -183,7 +181,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.OnButtonClick = Tv1Column1PropertiesButtonClick HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 102 + Width = 55 end object Tv1Column7: TcxGridDBColumn Caption = #33394#24067#21517#31216 @@ -201,7 +199,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ListSource = DS_PM Properties.OnEditValueChanged = Tv1Column7PropertiesEditValueChanged HeaderAlignmentHorz = taCenter - Width = 125 + Width = 55 end object v1PRTColor: TcxGridDBColumn Caption = #39068#33394 @@ -216,7 +214,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ReadOnly = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 116 + Width = 55 end object Tv1Column12: TcxGridDBColumn Caption = #33394#21495 @@ -238,47 +236,57 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ListSource = DS_YS Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged HeaderAlignmentHorz = taCenter - Width = 75 + Width = 55 end object Tv1Column9: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column11: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 80 + Width = 55 end object Tv1Column5: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column10: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column15: TcxGridDBColumn Caption = #25253#21333#25968#37327 + DataBinding.FieldName = 'OrderQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 86 + Width = 55 end object Tv1Column16: TcxGridDBColumn Caption = #25253#21333#21333#20301 + DataBinding.FieldName = 'OrderUnit' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxLookupComboBoxProperties' + Properties.KeyFieldNames = 'CICUnit' + Properties.ListColumns = < + item + Caption = #21333#20301 + FieldName = 'CICUnit' + end> + Properties.ListSource = DS_DanWei HeaderAlignmentHorz = taCenter - Width = 110 + Width = 55 end object Tv1Column8: TcxGridDBColumn Caption = #24211#23384#21333#20301 @@ -286,35 +294,35 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 80 + Width = 55 end object Tv1Column4: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column6: TcxGridDBColumn Caption = #21253#32568#36153 DataBinding.FieldName = 'GangFee' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column13: TcxGridDBColumn Caption = #36816#36153 DataBinding.FieldName = 'Transfee' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column14: TcxGridDBColumn Caption = #20854#23427#36153 DataBinding.FieldName = 'Otherfee' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 55 end object Tv1Column17: TcxGridDBColumn Caption = #32039#24613#31243#24230 @@ -326,14 +334,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut #27491#24120 #32039#24613) HeaderAlignmentHorz = taCenter - Width = 95 + Width = 55 end object Tv1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'OrdSNote' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 105 + Width = 55 end object Tv1Column18: TcxGridDBColumn Caption = #22791#36135#29366#24577 @@ -348,6 +356,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut #27424#21333 #21462#28040#21333) HeaderAlignmentHorz = taCenter + Width = 55 end end object cxGrid1Level1: TcxGridLevel @@ -569,7 +578,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut BevelInner = bvNone Date = 40916.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.670856296288548000 + Time = 0.670856296288548100 TabOrder = 1 end object DLYDate: TDateTimePicker @@ -581,7 +590,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut BevelInner = bvNone Date = 40916.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.670856296288548000 + Time = 0.670856296288548100 ShowCheckbox = True TabOrder = 2 Visible = False @@ -728,6 +737,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Top = 312 end object GPM_1: TcxGridPopupMenu + Grid = cxGrid1 PopupMenus = <> Left = 748 Top = 312 @@ -838,4 +848,22 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Left = 214 Top = 346 end + object GPM_2: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 876 + Top = 496 + end + object DS_DanWei: TDataSource + DataSet = ADO_DanWei + Left = 664 + Top = 564 + end + object ADO_DanWei: TADOQuery + Connection = DataLink_TradeMarket.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 502 + Top = 536 + end end diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index 11c4cd3..ac55b10 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -105,6 +105,9 @@ type Tv1Column16: TcxGridDBColumn; Tv1Column17: TcxGridDBColumn; Tv1Column18: TcxGridDBColumn; + GPM_2: TcxGridPopupMenu; + DS_DanWei: TDataSource; + ADO_DanWei: TADOQuery; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -411,7 +414,14 @@ begin sql.Add(' SELECT C_GYSNAME FROM BS_Cloth_Info_GYSCP'); Open; end; - + with ADO_DanWei do + begin + Close; + sql.Clear; + sql.Add(' SELECT A.C_Code,B.CICUnit FROM Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient B on A.BCIID=B.BCIID '); + sql.Add(' where 2=1 '); + Open; + end; end; function TfrmTradeMarketInPut.SaveData(): Boolean; @@ -1322,22 +1332,10 @@ end; procedure TfrmTradeMarketInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin + + if not ADO_YS.IsEmpty then 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 + if ADO_YS.FieldByName('C_Code').AsString <> CDS_1.FieldByName('C_Code').AsString then begin with ADO_YS do begin @@ -1348,8 +1346,46 @@ begin 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; + + if not ADO_DanWei.IsEmpty then + begin + if ADO_DanWei.FieldByName('C_Code').AsString <> CDS_1.FieldByName('C_Code').AsString then + begin + with ADO_DanWei do + begin + Close; + sql.Clear; + sql.Add(' SELECT A.C_Code,B.CICUnit FROM Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient 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_DanWei do + begin + Close; + sql.Clear; + sql.Add(' SELECT A.C_Code,B.CICUnit FROM Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient B on A.BCIID=B.BCIID '); + sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString)); + Open; + end; + end; + +// Bs_Cloth_Info_Coefficient end; procedure TfrmTradeMarketInPut.TvMXCellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);