From 6f2ddd1985d4a05e8b48e76bb41c2d6c6b55be02 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 2 Jun 2025 09:59:11 +0800 Subject: [PATCH] 0602 --- A02基础产品管理/ClothInfo.identcache | Bin 2145 -> 2145 bytes A09财务通用管理/U_ReceivableList.dfm | 1 - A09财务通用管理/U_ReceivableList.pas | 36 +++++++++-------- B04采购计划管理/PurchasePlan.identcache | Bin 2384 -> 2384 bytes T01贸易生产计划/U_TradePlanList.dfm | 7 +--- T01贸易生产计划/U_TradePlanList.pas | 2 + T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm | 8 ++++ T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas | 10 +++++ T04贸易明细仓库/U_GetDllForm.pas | 2 +- T04贸易明细仓库/U_TradeClothStkListNew.dfm | 38 +++++++++++++----- T04贸易明细仓库/U_TradeClothStkListNew.pas | 23 +++++++++++ T04贸易明细仓库/U_TradeClothWaitReleased.dfm | 15 ++++++- T04贸易明细仓库/U_TradeClothWaitReleased.pas | 2 +- 13 files changed, 107 insertions(+), 37 deletions(-) diff --git a/A02基础产品管理/ClothInfo.identcache b/A02基础产品管理/ClothInfo.identcache index 5a15f02df6dadfd46619d500c95f47bdebb03d41..e0dc4fe1593792d7b881419c63ffac5ec739fdd2 100644 GIT binary patch delta 41 zcmV+^0M`HE5aAH8w*iv~0VtEc1{RY81sSvT0nh@IFatP~R0SH7w*fx0ZUyrKH#iPc delta 33 pcmaDT@K9jGcE-sDtah9Em@Y6)=3vyAe4kN&@;#QI&3UY!nE=z<3@!iw diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index 63e186b..10e0b00 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -127,7 +127,6 @@ inherited frmReceivableList: TfrmReceivableList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 32 object Label3: TLabel Left = 172 Top = 13 diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 3c47f18..2cbf6d9 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -483,28 +483,30 @@ begin end; procedure TfrmReceivableList.ToolButton1Click(Sender: TObject); -//var -// MFFIDS: string; +var + MFFIDS: string; begin if CDS_1.IsEmpty then exit; -// if not CDS_1.Locate('SSel', True, []) then -// begin -// application.MessageBox('ѡ', 'ʾ'); -// Exit; -// end; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; +// + MFFIDS:=''; + with CDS_1 do + begin + DisableControls; + while CDS_1.Locate('SSel', True, []) do + begin -// with CDS_1 do -// begin -// DisableControls; -// while CDS_1.Locate('SSel', True, []) do -// begin - MFFIDS := CDS_1.fieldbyname('FFID').AsString; -// CDS_1.Delete; -// end; -// EnableControls; -// end; + MFFIDS :=MFFIDS+ ',' + Trim(CDS_1.fieldbyname('FFID').AsString) ; + CDS_1.Delete; + end; + EnableControls; + end; try with ADOQueryCmd do diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache index 0fb60d18ef9aca44ead154c3c4b28b0dbe95bf02..7cafcdfe16ae255a0becefe779a067e29e0fae5c 100644 GIT binary patch delta 61 zcmca0bU|pt9j3{1809BNF!xTr!(=yEgH3+3Ez4TQ$)+6klik_YPqt;TnXJenGuemT RZnFtHBO_2%?Bo)TI{=~D6rBJ7 delta 65 zcmca0bU|pt9j3|sEOwJaIpinbVOle}fh_`vZ8j^i6fy!OoF|`VmYUqcZa0~qt#Gm) UyWM6nc1Fg@lUVI1mvGzx02^l(cmMzZ diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index 99b0c61..4576f39 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -7,7 +7,6 @@ inherited frmTradePlanList: TfrmTradePlanList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -185 ExplicitWidth = 1556 ExplicitHeight = 799 PixelsPerInch = 96 @@ -231,7 +230,6 @@ inherited frmTradePlanList: TfrmTradePlanList Color = 16242829 ParentBackground = False TabOrder = 1 - ExplicitTop = 70 object Label3: TLabel Left = 345 Top = 20 @@ -426,8 +424,6 @@ inherited frmTradePlanList: TfrmTradePlanList Align = alClient PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 145 - ExplicitHeight = 411 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -725,7 +721,6 @@ inherited frmTradePlanList: TfrmTradePlanList ' '#24050#23436#25104' ' ' '#20840#37096' ') OnChange = cxTabControl1Change - ExplicitTop = 127 ClientRectRight = 0 ClientRectTop = 0 end @@ -1688,7 +1683,7 @@ inherited frmTradePlanList: TfrmTradePlanList TabOrder = 17 end object BGNote: TMemo - Tag = 1 + Tag = 2 Left = 743 Top = 201 Width = 188 diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index 14b2fa9..1f85ee5 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -1213,6 +1213,7 @@ begin sql.Add(',BGLF=''' + Trim(BGLF.Text) + ''''); sql.Add(',BGMeter=''' + FloatToStr(strtofloatdef(Trim(BGMeter.Text),0)) + ''''); sql.Add(',consignee=''' + Trim(consignee.Text) + ''''); + sql.Add(',BGNote=''' + Trim(BGNote.Text) + ''''); sql.Add(',cm=''' + Trim(BGcm.Text) + ''''); sql.Add(',jm=''' + Trim(BGjm.Text) + ''''); SQL.Add(',Editer=''' + Trim(DName) + ''''); @@ -1256,6 +1257,7 @@ begin BGGramWeight.text := ''; consignee.text := ''; BGLF.text := ''; + BGNote.text := ''; // WriteCxGrid('ָʾбFF1', Tv3, 'ָʾ'); Panel4.Visible := False; diff --git a/T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm b/T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm index 1b35b79..4c0e9e4 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm +++ b/T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm @@ -76,6 +76,14 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit ImageIndex = 7 OnClick = TBCloseClick end + object ToolButton2: TToolButton + Left = 379 + Top = 0 + AutoSize = True + Caption = #19968#38190#26367#25442 + ImageIndex = 17 + OnClick = ToolButton2Click + end end object cxGrid2: TcxGrid [1] Left = 0 diff --git a/T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas b/T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas index 45a2190..0e0116e 100644 --- a/T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas +++ b/T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas @@ -57,6 +57,7 @@ type Tv1Column9: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; Tv1Column11: TcxGridDBColumn; + ToolButton2: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -68,6 +69,7 @@ type procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1Column14PropertiesEditValueChanged(Sender: TObject); procedure v1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure ToolButton2Click(Sender: TObject); private { Private declarations } function SaveCKData(): Boolean; @@ -402,6 +404,14 @@ begin end; +procedure TfrmTradeFinishClothOutEdit.ToolButton2Click(Sender: TObject); +begin + if CDS_Sub.IsEmpty then + Exit; + OneKeyPost(Tv1, CDS_Sub); + +end; + procedure TfrmTradeFinishClothOutEdit.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try diff --git a/T04贸易明细仓库/U_GetDllForm.pas b/T04贸易明细仓库/U_GetDllForm.pas index bcdcbe9..f41dd48 100644 --- a/T04贸易明细仓库/U_GetDllForm.pas +++ b/T04贸易明细仓库/U_GetDllForm.pas @@ -80,7 +80,7 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; Parameters1 := ''; Parameters4 := ''; - Parameters5 := ''; + Parameters5 := ''; DName:='ADMIN'; end else diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.dfm b/T04贸易明细仓库/U_TradeClothStkListNew.dfm index f325810..748dbf1 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.dfm +++ b/T04贸易明细仓库/U_TradeClothStkListNew.dfm @@ -47,18 +47,27 @@ AutoSize = True Caption = #30721#21333#25171#21360 ImageIndex = 21 + Visible = False OnClick = ToolButton2Click end - object ToolButton3: TToolButton + object ToolButton10: TToolButton Left = 166 Top = 0 AutoSize = True + Caption = #25353#21333#25171#21360 + ImageIndex = 21 + OnClick = ToolButton10Click + end + object ToolButton3: TToolButton + Left = 261 + Top = 0 + AutoSize = True Caption = #27515#36135#35774#32622 ImageIndex = 23 OnClick = ToolButton3Click end object ToolButton1: TToolButton - Left = 261 + Left = 356 Top = 0 AutoSize = True Caption = #25286#21305 @@ -66,7 +75,7 @@ OnClick = ToolButton1Click end object ToolButton9: TToolButton - Left = 332 + Left = 427 Top = 0 AutoSize = True Caption = #25286#37325 @@ -74,7 +83,7 @@ OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 403 + Left = 498 Top = 0 AutoSize = True Caption = #23548#20986 @@ -82,7 +91,7 @@ OnClick = TBExportClick end object ToolButton4: TToolButton - Left = 474 + Left = 569 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -90,7 +99,7 @@ OnClick = ToolButton4Click end object TBClose: TToolButton - Left = 569 + Left = 664 Top = 0 AutoSize = True Caption = #20851#38381 @@ -98,7 +107,7 @@ OnClick = TBCloseClick end object ToolButton5: TToolButton - Left = 640 + Left = 735 Top = 0 AutoSize = True Caption = #24211#20301#35843#25972 @@ -107,7 +116,7 @@ OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 735 + Left = 830 Top = 0 Caption = #24211#23384#31867#22411#35843#25972 ImageIndex = 1 @@ -115,7 +124,7 @@ OnClick = ToolButton6Click end object ToolButton7: TToolButton - Left = 850 + Left = 945 Top = 0 AutoSize = True Caption = #21333#20215#35843#25972 @@ -124,7 +133,7 @@ OnClick = ToolButton7Click end object ToolButton8: TToolButton - Left = 945 + Left = 1040 Top = 0 AutoSize = True Caption = #25968#25454#35843#25972 @@ -895,6 +904,10 @@ DataBinding.IsNullValueType = True Width = 71 end + object TV2Column15: TcxGridDBColumn + DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True + end end object cxGridLevel1: TcxGridLevel GridView = TV2 @@ -1411,6 +1424,7 @@ ParentFont = False PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 98 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1766,6 +1780,10 @@ HeaderAlignmentHorz = taCenter Width = 71 end + object Tv1Column18: TcxGridDBColumn + DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.pas b/T04贸易明细仓库/U_TradeClothStkListNew.pas index dbb470f..b1c4991 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.pas +++ b/T04贸易明细仓库/U_TradeClothStkListNew.pas @@ -195,6 +195,9 @@ type Panel5: TPanel; Label21: TLabel; JSUnit: TComboBox; + ToolButton10: TToolButton; + TV2Column15: TcxGridDBColumn; + Tv1Column18: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -231,6 +234,7 @@ type procedure ToolButton8Click(Sender: TObject); procedure BitBtn1Click(Sender: TObject); procedure ToolButton9Click(Sender: TObject); + procedure ToolButton10Click(Sender: TObject); private CurrentPage, RecordsNumber: Integer; lstPacketId: TStringList; @@ -645,6 +649,25 @@ begin Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; +procedure TfrmTradeClothStkListNew.ToolButton10Click(Sender: TObject); +begin + try + frmLabelPrint := TfrmLabelPrint.Create(Application); + with frmLabelPrint do + begin + FLMType := 'TradeClothStk'; + FFiltration1 := Trim(self.CDS_1.fieldbyname('OrderNo').AsString); + if ShowModal = 1 then + begin + + end; + end; + finally + frmLabelPrint.Free; + end; + +end; + procedure TfrmTradeClothStkListNew.ToolButton1Click(Sender: TObject); begin try diff --git a/T04贸易明细仓库/U_TradeClothWaitReleased.dfm b/T04贸易明细仓库/U_TradeClothWaitReleased.dfm index 9455fc8..46aeb87 100644 --- a/T04贸易明细仓库/U_TradeClothWaitReleased.dfm +++ b/T04贸易明细仓库/U_TradeClothWaitReleased.dfm @@ -27,7 +27,9 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 + DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -55,13 +57,13 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased Kind = skSum end> DataController.Summary.SummaryGroups = <> - OptionsCustomize.ColumnFiltering = False OptionsView.Footer = True OptionsView.GroupByBox = False Styles.Footer = DataLink_TradeClothStk.Default object v2Column3: TcxGridDBColumn Caption = #36873#20013 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -71,6 +73,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -78,6 +81,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -85,6 +89,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -92,6 +97,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object v2Column8: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -99,6 +105,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -106,6 +113,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -113,18 +121,21 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object Tv2Column2: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object Tv2Column3: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 83 end object v1PRTMF: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'ZPPS' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -132,6 +143,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object v1PRTKZ: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'ZPQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -139,6 +151,7 @@ object frmTradeClothWaitReleased: TfrmTradeClothWaitReleased object Tv2Column1: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 52 end diff --git a/T04贸易明细仓库/U_TradeClothWaitReleased.pas b/T04贸易明细仓库/U_TradeClothWaitReleased.pas index b71430d..237a0f5 100644 --- a/T04贸易明细仓库/U_TradeClothWaitReleased.pas +++ b/T04贸易明细仓库/U_TradeClothWaitReleased.pas @@ -10,7 +10,7 @@ uses cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox, Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, - dxBarBuiltInMenu, Vcl.ToolWin; + dxBarBuiltInMenu, Vcl.ToolWin, dxScrollbarAnnotations; type TfrmTradeClothWaitReleased = class(TForm)