diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas index 685c009..df1c200 100644 --- a/T02贸易汇总仓库/U_GetDllForm.pas +++ b/T02贸易汇总仓库/U_GetDllForm.pas @@ -87,7 +87,7 @@ begin Parameters1 := ''; // Parameters2 := 'óײƥ'; // Parameters2 := 'ŵ'; - Parameters2 := ''; +// Parameters2 := ''; DName := 'ADMIN'; DCode := 'ADMIN'; end diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm index 1f49758..3e5f0bc 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm @@ -340,16 +340,16 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList end object cxPageControl1: TcxPageControl [4] Left = 0 - Top = 149 + Top = 186 Width = 1234 - Height = 517 + Height = 480 Align = alClient TabOrder = 4 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change - ClientRectBottom = 517 + ClientRectBottom = 480 ClientRectRight = 1234 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet @@ -359,12 +359,10 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Left = 0 Top = 0 Width = 1234 - Height = 485 + Height = 448 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitLeft = -64 - ExplicitTop = 24 object TV2: TcxGridDBTableView OnDblClick = TV2DblClick Navigator.Buttons.CustomButtons = <> @@ -521,7 +519,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Left = 0 Top = 0 Width = 1234 - Height = 485 + Height = 448 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 @@ -1019,6 +1017,75 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList end end end + object Panel6: TPanel [5] + Left = 0 + Top = 149 + Width = 1234 + Height = 37 + Align = alTop + AutoSize = True + BevelInner = bvLowered + BorderStyle = bsSingle + TabOrder = 5 + DesignSize = ( + 1230 + 33) + object Label31: TLabel + Left = 14 + Top = 7 + Width = 96 + Height = 21 + Alignment = taCenter + Anchors = [akLeft] + Caption = #27599#39029#35760#24405#26465#25968 + Layout = tlCenter + ExplicitTop = 8 + end + object LBCPAP: TLabel + Left = 478 + Top = 6 + Width = 100 + Height = 20 + Alignment = taCenter + Anchors = [akLeft] + AutoSize = False + Caption = #24403#21069#39029'/'#24635#39029#25968 + Layout = tlCenter + ExplicitTop = 7 + end + object BTLP: TButton + Left = 391 + Top = 4 + Width = 78 + Height = 27 + Anchors = [akLeft] + Caption = #19978#19968#39029 + TabOrder = 0 + end + object BTNP: TButton + Left = 585 + Top = 3 + Width = 78 + Height = 28 + Anchors = [akLeft] + Caption = #19979#19968#39029 + TabOrder = 1 + end + object TCBNOR: TcxComboBox + Tag = 2 + Left = 122 + Top = 2 + Properties.DropDownListStyle = lsEditFixedList + Properties.Items.Strings = ( + '500' + '1000' + '5000' + '10000') + TabOrder = 2 + Text = '500' + Width = 94 + end + end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TradeTotalClothStk.ADOLink Left = 497 diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas index c9c635b..9f1e643 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas @@ -13,7 +13,8 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, FrameDateSel, - cxContainer, cxMaskEdit, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters; + cxContainer, cxMaskEdit, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters, + System.Math; type TfrmTradeClothTotalInList = class(TfrmBaseList) @@ -131,6 +132,12 @@ type Tv1Column39: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; TV2Column1: TcxGridDBColumn; + Panel6: TPanel; + Label31: TLabel; + LBCPAP: TLabel; + BTLP: TButton; + BTNP: TButton; + TCBNOR: TcxComboBox; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -163,11 +170,13 @@ type procedure TV2DblClick(Sender: TObject); procedure cxPageControl1Change(Sender: TObject); private + CurrentPage, RecordsNumber: Integer; canshu1, FSTKName, canshu3, canshu4: string; FMXflag: string; //жǷˢеϸ procedure InitGrid1(); procedure InitGrid2(); procedure setStatus(); + procedure InitGrid(MWSql: string); { Private declarations } public { Public declarations } @@ -227,14 +236,24 @@ begin if Trim(canshu4) <> '' then SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + ''''; SqlStr := SqlStr + ' order by IOTime desc'; - InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID'); +// ShowMessage(SqlStr); +// InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID'); + if FMXflag = '' then //Ǿˢеϸ + begin + InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code'); + end + else + begin + InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID'); + end; + end; procedure TfrmTradeClothTotalInList.InitGrid2(); var SqlStr: string; begin - SqlStr := ' select A.BCIONO,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.StkPiece)),StkQty=sum(StkQty) '; + SqlStr := ' select A.BCIONO,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.Piece)),StkQty=sum(Qty) '; SqlStr := SqlStr + ' from BS_Cloth_IO A '; SqlStr := SqlStr + ' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)) + ''''; SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + ''''; @@ -256,16 +275,81 @@ end; procedure TfrmTradeClothTotalInList.TBRafreshClick(Sender: TObject); begin frmFrameDateSel1.BegDate.SetFocus; -// InitGrid2(); + CurrentPage := 1; + InitGrid(''); +// case cxPageControl1.ActivePageIndex of +// 0: +// begin +// FMXflag := ''; +// InitGrid2(); +// end; +// 1: +// begin +// FMXflag := ''; +// InitGrid1(); +// end; +// end; + +end; + +procedure TfrmTradeClothTotalInList.InitGrid(MWSql: string); +var + WSql, WDateSql: string; + SqlStr: string; +begin + + WDateSql := ' and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)); + WDateSql := WDateSql + ' and A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)); + WDateSql := WDateSql + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''''; + if Trim(canshu4) <> '' then + WDateSql := WDateSql + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + ''''; + case cxPageControl1.ActivePageIndex of 0: begin - InitGrid2(); +// WSql := CommonFiltersByContainer(dxLayoutControl_query, ' {"EquTag": 1,"LikeTag": 2,"Fields": "OrderNo|FtyPCId|FtyPCId|C_Color|C_Code|C_Name"}'); + + if trim(WSql) <> '' then + begin + WSql := WDateSql + ' and ' + trim(WSql); + end + else + WSql := WDateSql; + + SqlStr := ' select A.BCIONO,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.Piece)),StkQty=sum(Qty) '; + SqlStr := SqlStr + ' from BS_Cloth_IO A '; + SqlStr := SqlStr + ' where 1=1 ' + (WSql); + SqlStr := SqlStr + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''''; + SqlStr := SqlStr + ' and IOFlag='''' '; + if Trim(canshu4) <> '' then + SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + ''''; + + SqlStr := SqlStr + ' group by A.BCIONO,C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit'; +// showmessage(SqlStr); + InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code'); end; + 1: begin - FMXflag := ''; - InitGrid1(); + if MWSql = '' then + WSql := CommonFiltersByContainer(panel1, ' {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + else + WSql := MWSql; + + if trim(WSql) <> '' then + begin + WSql := WDateSql + ' and ' + trim(WSql); + end + else + WSql := WDateSql; + + SqlStr := 'exec P_Trade_Totalinlist_Get_Page '; + SqlStr := SqlStr + ' @pageIndex=' + inttostr(CurrentPage); + SqlStr := SqlStr + ' ,@pageSize=' + inttostr(RecordsNumber); + SqlStr := SqlStr + ' ,@criteria= ' + quotedstr(WSql); +// showmessage(SqlStr); + InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code'); + LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber)); end; end; @@ -338,17 +422,21 @@ procedure TfrmTradeClothTotalInList.BCIONoKeyPress(Sender: TObject; var Key: Cha begin if Key = #13 then begin - case cxPageControl1.ActivePageIndex of - 0: - begin - InitGrid2(); - end; - 1: - begin - FMXflag := ''; - InitGrid1(); - end; - end; + + CurrentPage := 1; + InitGrid(''); + +// case cxPageControl1.ActivePageIndex of +// 0: +// begin +// InitGrid2(); +// end; +// 1: +// begin +// FMXflag := ''; +// InitGrid1(); +// end; +// end; end; end; @@ -397,12 +485,14 @@ var mSql: string; begin inherited; + CurrentPage := 1; + RecordsNumber := 500; mSql := 'select distinct name=A.IOType from BS_Cloth_IO A where IOFlag='''' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''' '; SInitTcxComBoxBySql(ADOQueryTemp, IOType, false, mSql); ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó׻ֿܲ'); ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó׻ֿܲ'); setStatus(); - InitGrid2(); + InitGrid(''); end; procedure TfrmTradeClothTotalInList.TBExportClick(Sender: TObject); @@ -486,13 +576,15 @@ begin if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); ADOQueryCmd.Connection.CommitTrans; - InitGrid2(); - InitGrid1(); + InitGrid(''); +// InitGrid2(); +// InitGrid1(); except ADOQueryCmd.Connection.RollbackTrans; application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); - InitGrid2(); - InitGrid1(); + InitGrid(''); +// InitGrid2(); +// InitGrid1(); end; end; @@ -508,7 +600,8 @@ begin FSTKName := Self.FSTKName; if ShowModal = 1 then begin - Self.InitGrid2(); +// Self.InitGrid2(); + Self.InitGrid(''); end; end; finally @@ -593,42 +686,49 @@ procedure TfrmTradeClothTotalInList.cxButton1Click(Sender: TObject); begin inherited; frmFrameDateSel1.cxButton1Click(Sender); - InitGrid2(); + InitGrid(''); +// InitGrid2(); end; procedure TfrmTradeClothTotalInList.cxButton2Click(Sender: TObject); begin inherited; frmFrameDateSel1.cxButton2Click(Sender); - InitGrid2(); + InitGrid(''); +// InitGrid2(); end; procedure TfrmTradeClothTotalInList.cxButton3Click(Sender: TObject); begin inherited; frmFrameDateSel1.cxButton3Click(Sender); - InitGrid2() + InitGrid(''); +// InitGrid2() end; procedure TfrmTradeClothTotalInList.cxButton4Click(Sender: TObject); begin inherited; frmFrameDateSel1.cxButton4Click(Sender); - InitGrid2(); + InitGrid(''); +// InitGrid2(); end; procedure TfrmTradeClothTotalInList.cxButton5Click(Sender: TObject); begin inherited; frmFrameDateSel1.cxButton5Click(Sender); - InitGrid2(); + InitGrid(''); +// InitGrid2(); end; procedure TfrmTradeClothTotalInList.cxPageControl1Change(Sender: TObject); begin + case cxPageControl1.ActivePageIndex of 1: begin + FMXflag := ''; InitGrid1(); end; end; @@ -636,6 +736,7 @@ end; procedure TfrmTradeClothTotalInList.cxTabControl1Change(Sender: TObject); begin + InitGrid2(); end; diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm index 195a55a..a660d65 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm @@ -9,6 +9,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitTop = -112 ExplicitWidth = 1297 ExplicitHeight = 775 PixelsPerInch = 96 @@ -325,14 +326,14 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 - Properties.TabPosition = tpBottom OnChange = cxPageControl1Change - ClientRectBottom = 527 + ClientRectBottom = 559 ClientRectRight = 1281 - ClientRectTop = 0 + ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = ' '#20135#21697#27719#24635' ' ImageIndex = 0 + ExplicitTop = 0 object cxGrid2: TcxGrid Left = 0 Top = 0 @@ -1060,7 +1061,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList TabOrder = 5 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - Properties.TabIndex = 0 + Properties.TabIndex = 2 Properties.Tabs.Strings = ( #26032#20313#26410#20837#24211 #26032#20313#24050#20837#24211 diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm index 120a320..4965419 100644 --- a/T03贸易布匹检验/U_MachRollMain.dfm +++ b/T03贸易布匹检验/U_MachRollMain.dfm @@ -895,7 +895,7 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' DoubleBuffered = False EdgeInner = esNone @@ -914,7 +914,7 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = ToolButton3Click end object Trolldel: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #21024#38500 @@ -922,7 +922,7 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = TrolldelClick end object ToolButton1: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #25171#21367#35774#32622 @@ -930,14 +930,14 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = ToolButton1Click end object Tlog: TToolButton - Left = 213 + Left = 245 Top = 0 AutoSize = True Caption = #26085#24535 ImageIndex = 30 end object ToolButton8: TToolButton - Left = 276 + Left = 316 Top = 0 AutoSize = True Caption = #20851#38381 @@ -959,21 +959,21 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 285 Width = 327 inline FrameKeyBoard1: TFrameKeyBoard - Left = 4 - Top = 23 - Width = 319 - Height = 246 + Left = 2 + Top = 26 + Width = 323 + Height = 257 Align = alClient TabOrder = 0 - ExplicitLeft = 4 - ExplicitTop = 23 - ExplicitWidth = 319 - ExplicitHeight = 246 + ExplicitLeft = 2 + ExplicitTop = 26 + ExplicitWidth = 323 + ExplicitHeight = 257 inherited dxPanel1: TdxPanel - Width = 319 - Height = 246 - ExplicitWidth = 319 - ExplicitHeight = 246 + Width = 323 + Height = 257 + ExplicitWidth = 323 + ExplicitHeight = 257 inherited SpeedButton1: TSpeedButton OnClick = FrameKeyBoard1SpeedButton1Click end diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas index 9a9c9e3..aab48ae 100644 --- a/T03贸易布匹检验/U_MachRollMain.pas +++ b/T03贸易布匹检验/U_MachRollMain.pas @@ -18,7 +18,7 @@ uses U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, frxBarcode, frxRich, frxOLE, frxTableObject, frxExportXLSX, frxClass, frxExportBaseDialog, - frxExportPPTX, frxDBSet, dxSkinWXI; + frxExportPPTX, frxDBSet, dxSkinWXI, dxSkinsDefaultPainters; type TfrmMachRollMain = class(TfrmBaseList) @@ -241,7 +241,6 @@ begin SqlStr := ' exec P_Trade_Market_WaitOut '; SqlStr := SqlStr + ' @C_Code =' + quotedstr(trim(FC_Code)); SqlStr := SqlStr + ' ,@C_ColorNo =' + quotedstr(trim(FC_ColorNo)); - InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, '', ''); end; diff --git a/T03贸易布匹检验/U_TradeClothInspList.dfm b/T03贸易布匹检验/U_TradeClothInspList.dfm index bbfd46d..4910a6b 100644 --- a/T03贸易布匹检验/U_TradeClothInspList.dfm +++ b/T03贸易布匹检验/U_TradeClothInspList.dfm @@ -20,7 +20,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList BevelInner = bvLowered BorderStyle = bsSingle TabOrder = 2 - ExplicitWidth = 1556 DesignSize = ( 1917 33) @@ -97,7 +96,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList List = True ShowCaptions = True TabOrder = 4 - ExplicitWidth = 1556 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -141,7 +139,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Visible = False end object TBZF: TToolButton - Left = 500 + Left = 506 Top = 0 AutoSize = True Caption = #21024#38500 @@ -149,7 +147,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = TBZFClick end object Tout: TToolButton - Left = 571 + Left = 577 Top = 0 AutoSize = True Caption = #20837#24211 @@ -157,7 +155,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = ToolButton6Click end object Tunout: TToolButton - Left = 642 + Left = 648 Top = 0 AutoSize = True Caption = #25764#38144#20837#24211 @@ -165,7 +163,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = TunoutClick end object ToolButton4: TToolButton - Left = 745 + Left = 751 Top = 0 AutoSize = True Caption = #25171#21253 @@ -173,7 +171,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = ToolButton4Click end object btnJYBG: TToolButton - Left = 816 + Left = 822 Top = 0 AutoSize = True Caption = #26816#39564#25253#21578 @@ -181,7 +179,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = btnJYBGClick end object Tprintmd: TToolButton - Left = 919 + Left = 925 Top = 0 AutoSize = True Caption = #25171#21360#30721#21333 @@ -189,7 +187,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = TprintmdClick end object TBExport: TToolButton - Left = 1022 + Left = 1028 Top = 0 AutoSize = True Caption = #23548#20986 @@ -197,7 +195,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = TBExportClick end object ToolButton5: TToolButton - Left = 1093 + Left = 1099 Top = 0 AutoSize = True Caption = #26085#24535 @@ -205,7 +203,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = ToolButton5Click end object ToolButton1: TToolButton - Left = 1164 + Left = 1170 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -213,7 +211,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 1251 + Left = 1273 Top = 0 AutoSize = True Caption = #20851#38381 @@ -240,7 +238,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList TabOrder = 3 AutoSize = True LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1 - ExplicitWidth = 1556 object OrderNo: TcxTextEdit Tag = 2 Left = 88 @@ -648,17 +645,15 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Height = 606 Align = alClient TabOrder = 6 - Properties.ActivePage = cxTabSheet2 + Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 - ExplicitWidth = 1556 ClientRectBottom = 606 ClientRectRight = 1921 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = ' '#20135#21697#27719#24635#20449#24687' ' ImageIndex = 0 - ExplicitWidth = 1556 object cxGrid2: TcxGrid Left = 0 Top = 0 @@ -668,7 +663,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList BorderStyle = cxcbsNone PopupMenu = pm2 TabOrder = 0 - ExplicitWidth = 1556 object TV2: TcxGridDBTableView OnDblClick = TV2DblClick OnMouseUp = Tv1MouseUp @@ -869,7 +863,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object cxTabSheet2: TcxTabSheet Caption = ' '#20135#21697#26126#32454#20449#24687' ' ImageIndex = 1 - ExplicitWidth = 1556 object cxGrid1: TcxGrid Left = 0 Top = 0 @@ -879,7 +872,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 0 - ExplicitTop = 3 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> @@ -1324,7 +1316,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ParentColor = False TabOrder = 7 ExplicitTop = 38 - ExplicitWidth = 1556 + ExplicitWidth = 1921 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 diff --git a/T03贸易布匹检验/U_TradeClothInspList.pas b/T03贸易布匹检验/U_TradeClothInspList.pas index e99b140..d2dffaf 100644 --- a/T03贸易布匹检验/U_TradeClothInspList.pas +++ b/T03贸易布匹检验/U_TradeClothInspList.pas @@ -336,7 +336,7 @@ begin SqlStr := SqlStr + ' @pageIndex=' + inttostr(CurrentPage); SqlStr := SqlStr + ' ,@pageSize=' + inttostr(RecordsNumber); SqlStr := SqlStr + ' ,@criteria= ' + quotedstr(WSql); - +// showmessage(SqlStr); InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, '', ''); LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(Order_Main.FieldByName('TotalCount').AsInteger / RecordsNumber)); end; diff --git a/T03贸易布匹检验/testDll.dproj b/T03贸易布匹检验/testDll.dproj index 21f459b..9da8a71 100644 --- a/T03贸易布匹检验/testDll.dproj +++ b/T03贸易布匹检验/testDll.dproj @@ -139,6 +139,7 @@ true PerMonitorV2 CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + D:\Dp10RepoV1\项目代码\D10xhGemei\T03贸易布匹检验\testDll.exe diff --git a/T03贸易布匹检验/testDll.skincfg b/T03贸易布匹检验/testDll.skincfg new file mode 100644 index 0000000..c0891d9 --- /dev/null +++ b/T03贸易布匹检验/testDll.skincfg @@ -0,0 +1,5 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinsDefaultPainters=1 diff --git a/T05贸易门市管理/U_TradeMarketQtyInPut.pas b/T05贸易门市管理/U_TradeMarketQtyInPut.pas index 54d4e87..0560636 100644 --- a/T05贸易门市管理/U_TradeMarketQtyInPut.pas +++ b/T05贸易门市管理/U_TradeMarketQtyInPut.pas @@ -12,7 +12,8 @@ uses cxTextEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, System.ImageList, Vcl.ImgList, ComObj, dxScrollbarAnnotations, cxContainer, dxCore, cxDateUtils, - cxMaskEdit, cxImageList, cxCurrencyEdit, Vcl.Menus, Clipbrd; + cxMaskEdit, cxImageList, cxCurrencyEdit, Vcl.Menus, Clipbrd, dxSkinsCore, + dxSkinsDefaultPainters; type TfrmTradeMarketQtyInPut = class(TfrmBaseInput) @@ -205,7 +206,7 @@ begin FieldByName('TMSQID').AsString := FieldByName('TMSQID').AsString; FieldByName('TMSId').AsString := FieldByName('TMSId').AsString; FieldByName('TMMId').AsString := FieldByName('TMMId').AsString; - FieldByName('Qty').value := StrTofloatDef(inQty.Text, 0); +// FieldByName('Qty').value := StrTofloatDef(inQty.Text, 0); Post; end; Next;