diff --git a/应收应付/U_YSCR.dfm b/应收应付/U_YSCR.dfm index 00278b4..4e77737 100644 --- a/应收应付/U_YSCR.dfm +++ b/应收应付/U_YSCR.dfm @@ -20,7 +20,7 @@ object frmYSCR: TfrmYSCR object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1193 + Width = 1201 Height = 31 ButtonHeight = 30 ButtonWidth = 83 @@ -117,7 +117,7 @@ object frmYSCR: TfrmYSCR object Panel1: TPanel Left = 0 Top = 31 - Width = 1193 + Width = 1201 Height = 70 Align = alTop BevelInner = bvRaised @@ -255,8 +255,8 @@ object frmYSCR: TfrmYSCR object cxGrid2: TcxGrid Left = 0 Top = 123 - Width = 1193 - Height = 289 + Width = 1201 + Height = 297 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -427,7 +427,7 @@ object frmYSCR: TfrmYSCR object cxTabControl1: TcxTabControl Left = 0 Top = 101 - Width = 1193 + Width = 1201 Height = 22 Align = alTop TabOrder = 2 @@ -440,13 +440,13 @@ object frmYSCR: TfrmYSCR #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1193 + ClientRectRight = 1201 ClientRectTop = 19 end object cxGrid1: TcxGrid Left = 0 - Top = 412 - Width = 1193 + Top = 420 + Width = 1201 Height = 237 Align = alBottom TabOrder = 4 diff --git a/应收应付/U_YSCR.pas b/应收应付/U_YSCR.pas index 08c53b8..eca8ad7 100644 --- a/应收应付/U_YSCR.pas +++ b/应收应付/U_YSCR.pas @@ -13,7 +13,20 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, Menus, cxLookAndFeels, cxLookAndFeelPainters, - cxNavigator, dxBarBuiltInMenu; + cxNavigator, dxBarBuiltInMenu, dxSkinsCore, 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, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmYSCR = class(TForm) diff --git a/应收应付/U_YSKInput.dfm b/应收应付/U_YSKInput.dfm index 0f8f87d..535456a 100644 --- a/应收应付/U_YSKInput.dfm +++ b/应收应付/U_YSKInput.dfm @@ -625,15 +625,27 @@ object frmYSKInput: TfrmYSKInput HeaderAlignmentHorz = taCenter Width = 145 end + object Tv1Column4: TcxGridDBColumn + Caption = #31354#21152#37329#39069 + DataBinding.FieldName = 'kjiamoney' + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end object Tv1Column3: TcxGridDBColumn Caption = #31354#21152 DataBinding.FieldName = 'Kjia' + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 70 end object Tv1Column2: TcxGridDBColumn Caption = #31354#21152#25968#37327 DataBinding.FieldName = 'KjiaQTY' + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 65 end diff --git a/应收应付/U_YSKInput.pas b/应收应付/U_YSKInput.pas index 41aad59..e9c27af 100644 --- a/应收应付/U_YSKInput.pas +++ b/应收应付/U_YSKInput.pas @@ -96,6 +96,7 @@ type Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TSaveClick(Sender: TObject); @@ -469,8 +470,8 @@ end; procedure TfrmYSKInput.v1QtyPropertiesEditValueChanged(Sender: TObject); var - mvalue, FFieldName, SPrice,SKjiaQTY: string; - FQty, FPrice, FMxMoney, FHKMoney, FPiYangCost, FBZPrice, FBZMoney, FKjiaQTY, FKjiamoney: double; + mvalue, FFieldName, SPrice,SKjiaQTY,sKJia: string; + FQty, FPrice, FMxMoney, FHKMoney, FPiYangCost, FBZPrice, FBZMoney, FKjiaQTY, FKjiamoney,FKjia: double; FPS: Integer; begin mvalue := TcxTextEdit(Sender).EditingText; @@ -495,16 +496,33 @@ begin FPiYangCost := FieldByName('PiYangCost').AsFloat; FBZPrice := FieldByName('BZPrice').AsFloat; FBZMoney := FieldByName('BZMoney').AsFloat; - SKjiaQTY := FieldByName('kjiaQTY').asstring; - FKjiaQTY := StrtoFloatDef(SKjiaQTY, 0) ; + SKjiaQTY := FieldByName('kjiaQTY').asstring ; +// Skjia:= FieldByName('kjia').asstring ; +//// FKjiaQTY := StrtoFloatDef(SKjiaQTY, 0) ; +// FKjia := StrtoFloatDef(SKjia, 0) ; + +// if SKjiaQTY <> '' then +// begin +// FKjiaQTY := StrtoFloatDef(SKjiaQTY, 0) ; +// end; +// if SKjiaQTY= ''then +// begin + Skjia:= FieldByName('kjia').asstring ; + FKjia := StrtoFloatDef(SKjia, 0) ; + FKjiaQTY := strtofloat(format('%.2f', [FKjia * FPS])); +// end; end; + FKjiamoney := strtofloat(format('%.2f', [FPrice * FKjiaQTY])); FBZMoney := strtofloat(format('%.2f', [FPS * FBZPrice])); FHKMoney := strtofloat(format('%.2f', [FQty * FPrice])); - FMxMoney := FHKMoney + FPiYangCost + FBZMoney+FKjiamoney ; + FMxMoney := FHKMoney + FPiYangCost + FBZMoney - FKjiamoney ; + with YFSub do begin Edit; + FieldbyName('Kjiaqty').Value := FKjiaQTY; + FieldbyName('Kjiamoney').Value := FKjiamoney; FieldbyName('BZMoney').Value := FBZMoney; FieldbyName('HKMoney').Value := FHKMoney; FieldbyName('MxMoney').Value := FMxMoney; @@ -660,7 +678,7 @@ begin self.YFSub.FieldByName('PiYangCost').Value := 0; self.YFSub.FieldByName('BZPrice').Value := 0; self.YFSub.FieldByName('BZMoney').Value := 0; - self.YFSub.FieldByName('KjiaQTY').Value := StrToFloatdef(CDS_Main.FieldByName('Kjia').AsString, 0) * StrToFloatdef(CDS_Main.FieldByName('JQty').AsString, 0); +// self.YFSub.FieldByName('KjiaQTY').Value := StrToFloatdef(CDS_Main.FieldByName('Kjia').AsString, 0) * StrToFloatdef(CDS_Main.FieldByName('JQty').AsString, 0); self.YFSub.post; CDS_Main.Delete; diff --git a/应收应付/U_YSMXlist.dfm b/应收应付/U_YSMXlist.dfm index 5e8a1ee..bf8df3e 100644 --- a/应收应付/U_YSMXlist.dfm +++ b/应收应付/U_YSMXlist.dfm @@ -1,6 +1,6 @@ object frmYSMXlist: TfrmYSMXlist - Left = 323 - Top = 172 + Left = 266 + Top = 265 Width = 1574 Height = 614 Caption = #24212#25910#23545#36134#20449#24687#34920 diff --git a/应收应付/YSYF.dof b/应收应付/YSYF.dof index 05e6075..4eb7aea 100644 --- a/应收应付/YSYF.dof +++ b/应收应付/YSYF.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\ÈýË®\Ó¦ÊÕÓ¦¸¶\testDll.exe +HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\D7lmSanshui\Ó¦ÊÕÓ¦¸¶\testDll.exe Launcher= UseLauncher=0 DebugCWD=