From 95cc79a4f5c8b04a46d0de3eaf3f9d77246a0abb Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 18 Sep 2025 10:18:16 +0800 Subject: [PATCH] ~ --- A09财务通用管理/U_ReceivableInput.dfm | 12 +- A09财务通用管理/U_ReceivableInput.pas | 122 ++++++++++++-------- A09财务通用管理/U_ReceivableList.pas | 3 +- T02贸易汇总仓库/U_TradeClothTotalInList.dfm | 18 +-- T02贸易汇总仓库/U_TradeClothTotalInList.pas | 43 +++++-- T02贸易汇总仓库/U_TradeXinYuOutList.dfm | 18 +-- T02贸易汇总仓库/U_TradeXinYuOutList.pas | 3 + T05贸易门市管理/U_GetDllForm.pas | 2 +- T05贸易门市管理/U_TradeMarketInPut.pas | 4 + 9 files changed, 141 insertions(+), 84 deletions(-) diff --git a/A09财务通用管理/U_ReceivableInput.dfm b/A09财务通用管理/U_ReceivableInput.dfm index 06c14cd..a9c2ccb 100644 --- a/A09财务通用管理/U_ReceivableInput.dfm +++ b/A09财务通用管理/U_ReceivableInput.dfm @@ -60,10 +60,10 @@ object frmReceivableInput: TfrmReceivableInput Height = 447 Width = 1353 object cxGrid1: TcxGrid - Left = 4 - Top = 23 - Width = 1345 - Height = 408 + Left = 2 + Top = 26 + Width = 1349 + Height = 419 Align = alClient TabOrder = 0 object Tv1: TcxGridDBTableView @@ -446,8 +446,8 @@ object frmReceivableInput: TfrmReceivableInput Width = 151 end object OrderNo: TcxButtonEdit - Left = 337 - Top = 53 + Left = 339 + Top = 60 Properties.Buttons = < item Default = True diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas index d280c38..d36197d 100644 --- a/A09财务通用管理/U_ReceivableInput.pas +++ b/A09财务通用管理/U_ReceivableInput.pas @@ -108,7 +108,6 @@ type procedure v1QtyPropertiesEditValueChanged(Sender: TObject); procedure Tv1CustomDrawIndicatorCell(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxCustomGridIndicatorItemViewInfo; var ADone: Boolean); procedure ConNoPropertiesChange(Sender: TObject); - private { Private declarations } procedure InitGrid(); @@ -162,7 +161,8 @@ begin Filtered := False; Close; SQL.Clear; - sql.Add(' select * from Finance_Flow where FFID=''' + Trim(FFFID) + ''''); +// sql.Add(' select * from Finance_Flow where FFID=''' + Trim(FFFID) + ''''); + sql.Add(' select * from Finance_Flow where FromID1=''' + Trim(FFFID) + ''''); Open; end; SCreateCDS(ADOQueryMain, CDS_1); @@ -267,7 +267,26 @@ begin self.OrderNo.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('OrderNo').AsString); self.F_Code.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('C_Code').AsString); - + // ѡָʾϢ + First; + while Locate('SSel', True, []) do + begin + with Self.CDS_1 do + begin + Append; + Self.CDS_1.FieldByName('QtyUnit').AsString := frmFinTradePlanSel.CDS_1.FieldByName('OrdUnit').AsString; + Self.CDS_1.FieldByName('F_Name').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_Name').AsString; + Self.CDS_1.FieldByName('F_ColorNo').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_ColorNo').AsString; + Self.CDS_1.FieldByName('F_Color').AsString := frmFinTradePlanSel.CDS_1.FieldByName('C_Color').AsString; + Self.CDS_1.FieldByName('Price').AsString := frmFinTradePlanSel.CDS_1.FieldByName('ProcessingPrice').AsString; + Self.CDS_1.FieldByName('Currency').AsString := frmFinTradePlanSel.CDS_1.FieldByName('OrdUnit').AsString; + Self.CDS_1.FieldByName('Qty').AsString := frmFinTradePlanSel.CDS_1.FieldByName('OrdQty').AsString; + Self.CDS_1.FieldByName('QtyUnit').AsString := frmFinTradePlanSel.CDS_1.FieldByName('OrdUnit').AsString; + Self.CDS_1.post; + end; + frmFinTradePlanSel.CDS_1.Delete; + end; + // ѡָʾϢ with ADO2 do begin Filtered := False; @@ -296,6 +315,7 @@ begin end; end; end; + end; end; @@ -543,53 +563,65 @@ function TfrmReceivableInput.SaveData(): Boolean; var MaxId, MaxSubId, FCoCode, FCCID: string; begin + try ADOQueryCmd.Connection.BeginTrans; - if Trim(FFFID) = '' then + with CDS_1 do begin - if not GetLSNo(ADOQueryCmd, MaxId, 'YS', 'Finance_Flow', 4, 1) then - raise Exception.Create('ȡʧܣ'); - end - else - begin - MaxId := Trim(FFFID); - end; + First; + while not Eof do + begin + // if Trim(FFFID) = '' then + if Trim(CDS_1.fieldbyname('FFID').AsString) = '' then + begin + if not GetLSNo(ADOQueryCmd, MaxId, 'YS', 'Finance_Flow', 4, 1) then + raise Exception.Create('ȡʧܣ'); + end + else + begin + MaxId := Trim(CDS_1.fieldbyname('FFID').AsString);//Trim(FFFID); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; +// sql.Add('select * from Finance_Flow where FFID=''' + Trim(FFFID) + ''''); + sql.Add('select * from Finance_Flow where FFID=''' +Trim(CDS_1.fieldbyname('FFID').AsString)+ ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_1.fieldbyname('FFID').AsString)='' then //Trim(FFFID) = '' + begin + Append; + FieldByName('FillId').Value := Trim(DCode); + FieldByName('Filler').Value := Trim(DName); + FieldByName('FFFlag').Value := 'Ӧ'; + FieldByName('FFType').Value := 'ӦտǼ'; + FieldByName('status').Value := '0'; + FieldByName('FFQtyFlag').Value := 1; + end + else + begin + Edit; + FieldByName('EditId').Value := Trim(DCode); + FieldByName('Editer').Value := Trim(DName); + FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + end; + FieldByName('Store').Value := Trim(canshu4); + FieldByName('OppCoNo').Value := Trim(OppCoName.Properties.LookupItems.Text); + FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text); + FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.Properties.LookupItems.Text); + FieldByName('FFID').Value := Trim(MaxId); + RTSetsavedata(ADOQueryCmd, 'Finance_Flow', ScrollBox1, 0); - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('select * from Finance_Flow where FFID=''' + Trim(FFFID) + ''''); - Open; - end; - with ADOQueryCmd do - begin - if Trim(FFFID) = '' then - begin - Append; - FieldByName('FillId').Value := Trim(DCode); - FieldByName('Filler').Value := Trim(DName); - FieldByName('FFFlag').Value := 'Ӧ'; - FieldByName('FFType').Value := 'ӦտǼ'; - FieldByName('status').Value := '0'; - FieldByName('FFQtyFlag').Value := 1; - end - else - begin - Edit; - FieldByName('EditId').Value := Trim(DCode); - FieldByName('Editer').Value := Trim(DName); - FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Finance_Flow', 0); + Post; + + end; + Next; end; - FieldByName('Store').Value := Trim(canshu4); - FieldByName('OppCoNo').Value := Trim(OppCoName.Properties.LookupItems.Text); - FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text); - FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.Properties.LookupItems.Text); - FieldByName('FFID').Value := Trim(MaxId); - RTSetsavedata(ADOQueryCmd, 'Finance_Flow', ScrollBox1, 0); - RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Finance_Flow', 0); - Post; end; ADOQueryCmd.Connection.CommitTrans; @@ -665,8 +697,6 @@ begin end; end; - - procedure TfrmReceivableInput.Tv1CustomDrawIndicatorCell(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxCustomGridIndicatorItemViewInfo; var ADone: Boolean); var FValue: string; diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index a20a1e4..c056c2f 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -704,7 +704,8 @@ begin with frmReceivableInput do begin canshu4 := Self.canshu4; - FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString); + FFFID := Trim(SELF.CDS_1.fieldbyname('FromID1').AsString); +// FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString); FAuthority := Self.FAuthority; if ShowModal = 1 then begin diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm index f48c266..1f49758 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm @@ -28,7 +28,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList ParentColor = False ShowCaptions = True TabOrder = 2 - ExplicitWidth = 1295 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -131,7 +130,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList ParentBackground = False ParentColor = True TabOrder = 3 - ExplicitWidth = 1295 object Label3: TLabel Left = 254 Top = 47 @@ -268,7 +266,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList TabOrder = 6 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 1291 + ExplicitWidth = 1230 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -347,20 +345,16 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Height = 517 Align = alClient TabOrder = 4 - Properties.ActivePage = cxTabSheet2 + Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change - ExplicitWidth = 1295 - ExplicitHeight = 514 ClientRectBottom = 517 ClientRectRight = 1234 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = ' '#20135#21697#27719#24635' ' ImageIndex = 0 - ExplicitWidth = 1295 - ExplicitHeight = 482 object cxGrid2: TcxGrid Left = 0 Top = 0 @@ -369,8 +363,8 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitWidth = 1295 - ExplicitHeight = 482 + ExplicitLeft = -64 + ExplicitTop = 24 object TV2: TcxGridDBTableView OnDblClick = TV2DblClick Navigator.Buttons.CustomButtons = <> @@ -523,8 +517,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList object cxTabSheet2: TcxTabSheet Caption = #20135#21697#26126#32454 ImageIndex = 1 - ExplicitWidth = 1295 - ExplicitHeight = 482 object cxGrid1: TcxGrid Left = 0 Top = 0 @@ -533,8 +525,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitWidth = 1295 - ExplicitHeight = 482 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas index 3394933..c9c635b 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas @@ -164,6 +164,7 @@ type procedure cxPageControl1Change(Sender: TObject); private canshu1, FSTKName, canshu3, canshu4: string; + FMXflag: string; //жǷˢеϸ procedure InitGrid1(); procedure InitGrid2(); procedure setStatus(); @@ -213,23 +214,26 @@ begin SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + ''''; SqlStr := SqlStr + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + ''''; SqlStr := SqlStr + ' and IOFlag='''' '; + if FMXflag = '' then //Ǿˢеϸ + begin - WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}'); + end + else + begin + WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}'); + end; if TRIM(WSqlStr) <> '' then SqlStr := SqlStr + ' and ' + WSqlStr; - 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'); end; procedure TfrmTradeClothTotalInList.InitGrid2(); var SqlStr: string; -begin // QtyUnitwhats meanings? +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 := SqlStr + ' from BS_Cloth_IO A '; SqlStr := SqlStr + ' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)) + ''''; @@ -252,7 +256,19 @@ end; procedure TfrmTradeClothTotalInList.TBRafreshClick(Sender: TObject); begin frmFrameDateSel1.BegDate.SetFocus; - InitGrid2(); +// InitGrid2(); + case cxPageControl1.ActivePageIndex of + 0: + begin + InitGrid2(); + end; + 1: + begin + FMXflag := ''; + InitGrid1(); + end; + end; + end; procedure TfrmTradeClothTotalInList.ToolButton1Click(Sender: TObject); @@ -315,12 +331,25 @@ end; procedure TfrmTradeClothTotalInList.TV2DblClick(Sender: TObject); begin cxPageControl1.ActivePageIndex := 1; + FMXflag := ''; end; procedure TfrmTradeClothTotalInList.BCIONoKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then - InitGrid2(); + begin + case cxPageControl1.ActivePageIndex of + 0: + begin + InitGrid2(); + end; + 1: + begin + FMXflag := ''; + InitGrid1(); + end; + end; + end; end; procedure TfrmTradeClothTotalInList.btn1Click(Sender: TObject); diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm index 9d7dfcf..cfe2fb0 100644 --- a/T02贸易汇总仓库/U_TradeXinYuOutList.dfm +++ b/T02贸易汇总仓库/U_TradeXinYuOutList.dfm @@ -3,13 +3,13 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList Top = 13 Caption = #22823#36135#21333 ClientHeight = 594 - ClientWidth = 1985 + ClientWidth = 1924 Color = clBtnFace Font.Height = -16 FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitWidth = 2001 + ExplicitWidth = 1940 ExplicitHeight = 633 PixelsPerInch = 96 TextHeight = 21 @@ -17,7 +17,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList Tag = 1 Left = 0 Top = 0 - Width = 1985 + Width = 1924 Height = 30 AutoSize = True ButtonHeight = 30 @@ -95,7 +95,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1985 + Width = 1924 Height = 91 Align = alTop BevelInner = bvRaised @@ -165,7 +165,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList inline frmFrameDateSel1: TfrmFrameDateSel Left = 2 Top = 2 - Width = 1981 + Width = 1920 Height = 37 Align = alTop Color = clWhite @@ -174,7 +174,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList TabOrder = 4 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 1981 + ExplicitWidth = 1920 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -187,7 +187,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList object cxGrid1: TcxGrid [2] Left = 0 Top = 152 - Width = 1985 + Width = 1924 Height = 442 Align = alClient PopupMenu = PM_1 @@ -403,7 +403,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList object cxTabControl1: TcxTabControl [3] Left = 0 Top = 121 - Width = 1985 + Width = 1924 Height = 31 Align = alTop TabOrder = 2 @@ -416,7 +416,7 @@ inherited frmTradeXinYuOutList: TfrmTradeXinYuOutList ' '#20840#37096' ') OnChange = cxTabControl1Change ClientRectBottom = 31 - ClientRectRight = 1985 + ClientRectRight = 1924 ClientRectTop = 28 end inherited loadProcess: TPanel diff --git a/T02贸易汇总仓库/U_TradeXinYuOutList.pas b/T02贸易汇总仓库/U_TradeXinYuOutList.pas index bd0de01..5e97fd4 100644 --- a/T02贸易汇总仓库/U_TradeXinYuOutList.pas +++ b/T02贸易汇总仓库/U_TradeXinYuOutList.pas @@ -355,6 +355,9 @@ begin sql.Add('update Trade_Market_Main SET status=''10'' '); sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString))); + sql.Add(' update Trade_Market_Sub SET OutQty=(select sum(qty) from Trade_Market_Sub_Qty x where x.TMSId = Trade_Market_Sub.TMSID) '); + sql.Add('where TMMId=' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString))); + sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) '); sql.Add('values(''óײ'' '); sql.Add(',' + quotedstr(trim(Order_Main.fieldbyname('TMMId').AsString))); diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas index 4218911..1bc56bc 100644 --- a/T05贸易门市管理/U_GetDllForm.pas +++ b/T05贸易门市管理/U_GetDllForm.pas @@ -78,7 +78,7 @@ begin //Parameters1 := ''; Parameters1 := 'ѯ'; // Parameters2 := '֯'; - Parameters4 := ''; +// Parameters4 := ''; DCode := 'ADMIN'; DName := 'ADMIN'; end diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index 22c6f7f..85e44aa 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -491,8 +491,12 @@ begin sql.Clear; sql.Add(' SELECT distinct A.C_Code,A.C_Name,A.qtyunit,A.HotQty,StkQty = SUM(B.StkQty) '); SQL.ADD(' FROM Bs_Cloth_Info A LEFT JOIN Bs_Cloth_Io B on A.C_Code=B.C_Code'); + sql.add(' where B.ioflag='''' '); + if Trim(canshu4) = '' then + sql.Add(' and isnull(STKNAME,'''')='''' '); SQL.add('group by A.C_Code,A.C_Name,A.qtyunit,A.HotQty'); SQL.ADD('order by A.C_Code '); +// showmessage(SQL.text); Open; end; with ADO_YS do