From 0818a553232de4e42ba689185dedcdb64cae3020 Mon Sep 17 00:00:00 2001 From: funa <1559646174@qq.com> Date: Sat, 14 Nov 2026 17:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.dfm | 9 +++++++++ B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.pas | 22 ++++++++++++++-------- B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.dfm | 10 ++++++++++ B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.pas | 1 + 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.dfm b/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.dfm index bfbdeb8..ca65bab 100644 --- a/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.dfm +++ b/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.dfm @@ -970,6 +970,15 @@ inherited frmSalesConInPut: TfrmSalesConInPut Options.Sorting = False Width = 70 end + object Tv1SampleFee: TcxGridDBColumn + Caption = #35797#26679#36153 + DataBinding.FieldName = 'sample_fee' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end object Tv1Column9: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'ConTotalAmount' diff --git a/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.pas b/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.pas index 657f899..54cd7df 100644 --- a/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.pas +++ b/B01基础å�ˆå�Œç®¡ç�†/U_SalesConInPut.pas @@ -132,6 +132,7 @@ type SalesId: TEdit; TallyId: TEdit; Tv1c_p_length: TcxGridDBColumn; + Tv1SampleFee: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -246,15 +247,16 @@ end; procedure TfrmSalesConInPut.JSMoney(); var - FConQty, FConPrice, FC_Money: Double; + FConQty, FConPrice, FSampleFee, FC_Money: Double; begin with Order_Sub do begin FConQty := Fieldbyname('ConQty').AsFloat; FConPrice := Fieldbyname('ConPrice').AsFloat; + FSampleFee := Fieldbyname('sample_fee').AsFloat; end; - //¼ÆËã½ð¶î£¬±£Áô2λСÊý - FC_Money := RoundFloat(FConQty * FConPrice, 2); + //¼ÆËã½ð¶î£¬±£Áô2λСÊý£¨½ð¶î=ÊýÁ¿*µ¥¼Û+ÊÔÑù·Ñ£© + FC_Money := RoundFloat(FConQty * FConPrice + FSampleFee, 2); with Order_Sub do begin Edit; @@ -744,7 +746,7 @@ end; procedure TfrmSalesConInPut.v1PRTOrderQtyPropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; - FConQty, FConPrice, FC_Money: Double; //¸öÊý£¬µ¥¼Û£¬½ð¶î + FConQty, FConPrice, FSampleFee, FC_Money: Double; //¸öÊý£¬µ¥¼Û£¬ÊÔÑù·Ñ£¬½ð¶î begin mvalue := TcxTextEdit(Sender).EditingText; if Trim(mvalue) = '' then @@ -760,14 +762,17 @@ begin Post; FConQty := Fieldbyname('ConQty').AsFloat; FConPrice := Fieldbyname('ConPrice').AsFloat; + FSampleFee := Fieldbyname('sample_fee').AsFloat; end; - FC_Money := RoundFloat(FConQty * FConPrice, 2); + //½ð¶î=ÊýÁ¿*µ¥¼Û+ÊÔÑù·Ñ + FC_Money := RoundFloat(FConQty * FConPrice + FSampleFee, 2); with Order_Sub do begin Edit; FieldByName('ConQty').Value := FConQty; FieldByName('ConPrice').Value := FConPrice; + FieldByName('sample_fee').Value := FSampleFee; FieldByName('ConTotalAmount').Value := FC_Money; Post; end; @@ -827,9 +832,10 @@ begin FieldByName('SSEL').Value := FALSE; FieldByName('SerialNo').Value := i; FieldByName('ConSId').Value := maxno; - FieldByName('C_Color').Value := ''; - FieldByName('ConQty').Value := null; - FieldByName('ConUnit').Value := 'M'; + FieldByName('C_Color').Value := ''; + FieldByName('ConQty').Value := null; + FieldByName('sample_fee').Value := null; + FieldByName('ConUnit').Value := 'M'; Post; end; SetXH(); diff --git a/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.dfm b/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.dfm index 73c65eb..e97d51c 100644 --- a/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.dfm +++ b/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.dfm @@ -692,6 +692,7 @@ inherited frmSalesContractList: TfrmSalesContractList Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom + ExplicitWidth = 8 end object cxGrid2: TcxGrid [5] Left = 0 @@ -915,6 +916,15 @@ inherited frmSalesContractList: TfrmSalesContractList Options.Sorting = False Width = 70 end + object TV2SampleFee: TcxGridDBColumn + Caption = #35797#26679#36153 + DataBinding.FieldName = 'sample_fee' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 70 + end object cxGridDBColumn9: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'ConTotalAmount' diff --git a/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.pas b/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.pas index 77a7c2e..b6abfcf 100644 --- a/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.pas +++ b/B01基础å�ˆå�Œç®¡ç�†/U_SalesContractList.pas @@ -142,6 +142,7 @@ type N5: TMenuItem; N6: TMenuItem; TV2c_p_length: TcxGridDBColumn; + TV2SampleFee: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject);