修改
This commit is contained in:
parent
138aa06395
commit
917d603e9e
|
|
@ -69,12 +69,11 @@ begin
|
|||
SetLength(pswd, 255);
|
||||
if trim(DataBaseStr) = '' then
|
||||
begin
|
||||
server := '121.40.233.100,7781';
|
||||
// server := '.';
|
||||
server := '139.196.56.206,7781';
|
||||
dtbase := 'sanshuidata';
|
||||
user := 'sa';
|
||||
pswd := 'rightsoft@123';
|
||||
// pswd := 'rightsoft';
|
||||
user := 'sanshuisa';
|
||||
// pswd:='rightsoft';
|
||||
pswd := 'rightsoft@8599';
|
||||
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
|
||||
|
||||
DParameters1 := '¸ßȨÏÞ';
|
||||
|
|
|
|||
|
|
@ -610,6 +610,18 @@ object frmPBRklist: TfrmPBRklist
|
|||
HeaderAlignmentHorz = taCenter
|
||||
Width = 74
|
||||
end
|
||||
object Tv1Column2: TcxGridDBColumn
|
||||
Caption = #20986#24211#21305#25968
|
||||
DataBinding.FieldName = 'CKPS'
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 60
|
||||
end
|
||||
object Tv1Column3: TcxGridDBColumn
|
||||
Caption = #20986#24211#31867#22411
|
||||
DataBinding.FieldName = 'CKLX'
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 60
|
||||
end
|
||||
end
|
||||
object cxGrid1Level1: TcxGridLevel
|
||||
GridView = Tv1
|
||||
|
|
|
|||
|
|
@ -11,7 +11,20 @@ uses
|
|||
cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxContainer,
|
||||
cxTextEdit, cxCurrencyEdit, cxCheckBox, RM_System, RM_Dataset, RM_Common,
|
||||
RM_Class, RM_GridReport, cxPC, Menus, cxLookAndFeels, cxLookAndFeelPainters,
|
||||
cxNavigator;
|
||||
cxNavigator, 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
|
||||
TfrmPBRklist = class(TForm)
|
||||
|
|
@ -87,6 +100,8 @@ type
|
|||
Tv1Column1: TcxGridDBColumn;
|
||||
CDS_PRT: TClientDataSet;
|
||||
ToolButton3: TToolButton;
|
||||
Tv1Column2: TcxGridDBColumn;
|
||||
Tv1Column3: TcxGridDBColumn;
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure TBAddClick(Sender: TObject);
|
||||
|
|
@ -180,6 +195,8 @@ begin
|
|||
close;
|
||||
sql.Clear;
|
||||
sql.Add('select A.* ');
|
||||
SQL.add(',CKLX=(select top 1 CRType from CK_PB_CR X where X.CRFlag=''³ö¿â'' and X.Valid=''Y'' and X.KCID=A.KCID )');
|
||||
SQL.add(',CKPS=(select sum(PS) from CK_PB_CR X where X.CRFlag=''³ö¿â'' and X.Valid=''Y'' and X.KCID=A.KCID )');
|
||||
sql.Add(',Case when isnull((select count(*) from TP_File where WBID=A.CRNO and TFType=''Å÷²¼»ã×ܸ½¼þ'' ),0)>0 ');
|
||||
sql.Add('then Cast(1 as bit) else Cast(0 as bit) end as FJFlag');
|
||||
sql.Add(' from CK_PB_CR A ');
|
||||
|
|
@ -587,4 +604,3 @@ end;
|
|||
|
||||
end.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -249,30 +249,30 @@ object frmYSCRMXList: TfrmYSCRMXList
|
|||
Width = 1290
|
||||
Height = 20
|
||||
Align = alTop
|
||||
Style = 9
|
||||
TabIndex = 0
|
||||
TabOrder = 2
|
||||
Tabs.Strings = (
|
||||
Properties.CustomButtons.Buttons = <>
|
||||
Properties.Style = 9
|
||||
Properties.TabIndex = 0
|
||||
Properties.Tabs.Strings = (
|
||||
#26410#23457#26680
|
||||
#24050#23457#26680
|
||||
#20840#37096)
|
||||
OnChange = cxTabControl1Change
|
||||
ClientRectBottom = 20
|
||||
ClientRectRight = 1290
|
||||
ClientRectTop = 19
|
||||
ClientRectRight = 0
|
||||
ClientRectTop = 0
|
||||
end
|
||||
object cxGrid1: TcxGrid
|
||||
Left = 0
|
||||
Top = 113
|
||||
Width = 1290
|
||||
Height = 537
|
||||
Height = 536
|
||||
Align = alClient
|
||||
TabOrder = 3
|
||||
object Tv1: TcxGridDBTableView
|
||||
OnDblClick = Tv1DblClick
|
||||
NavigatorButtons.ConfirmDelete = False
|
||||
NavigatorButtons.Delete.Enabled = False
|
||||
NavigatorButtons.Delete.Visible = False
|
||||
Navigator.Buttons.CustomButtons = <>
|
||||
Navigator.Buttons.Delete.Enabled = False
|
||||
Navigator.Buttons.Delete.Visible = False
|
||||
DataController.DataSource = DS_YFS
|
||||
DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
|
||||
DataController.Summary.DefaultGroupSummaryItems = <>
|
||||
|
|
@ -529,6 +529,12 @@ object frmYSCRMXList: TfrmYSCRMXList
|
|||
Options.Editing = False
|
||||
Width = 55
|
||||
end
|
||||
object Tv1Column1: TcxGridDBColumn
|
||||
Caption = #24037#33402
|
||||
DataBinding.FieldName = 'gongyi'
|
||||
HeaderAlignmentHorz = taCenter
|
||||
Width = 60
|
||||
end
|
||||
end
|
||||
object cxGridLevel2: TcxGridLevel
|
||||
GridView = Tv1
|
||||
|
|
|
|||
|
|
@ -12,7 +12,22 @@ uses
|
|||
cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
|
||||
RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
|
||||
IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
|
||||
cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit;
|
||||
cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit, cxLookAndFeels,
|
||||
cxLookAndFeelPainters, 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,
|
||||
dxBarBuiltInMenu, cxNavigator;
|
||||
|
||||
type
|
||||
TfrmYSCRMXList = class(TForm)
|
||||
|
|
@ -85,6 +100,7 @@ type
|
|||
v1Column7: TcxGridDBColumn;
|
||||
v1Column12: TcxGridDBColumn;
|
||||
v1Column23: TcxGridDBColumn;
|
||||
Tv1Column1: TcxGridDBColumn;
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
procedure TBCloseClick(Sender: TObject);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ object frmYSKInput: TfrmYSKInput
|
|||
object ToolBar1: TToolBar
|
||||
Left = 0
|
||||
Top = 0
|
||||
Width = 1600
|
||||
Width = 1592
|
||||
Height = 31
|
||||
ButtonHeight = 30
|
||||
ButtonWidth = 95
|
||||
|
|
@ -83,7 +83,7 @@ object frmYSKInput: TfrmYSKInput
|
|||
object ToolBar2: TToolBar
|
||||
Left = 0
|
||||
Top = 253
|
||||
Width = 1600
|
||||
Width = 1592
|
||||
Height = 29
|
||||
ButtonHeight = 30
|
||||
ButtonWidth = 59
|
||||
|
|
@ -122,7 +122,7 @@ object frmYSKInput: TfrmYSKInput
|
|||
object Panel1: TPanel
|
||||
Left = 0
|
||||
Top = 31
|
||||
Width = 1600
|
||||
Width = 1592
|
||||
Height = 222
|
||||
Align = alTop
|
||||
BevelOuter = bvLowered
|
||||
|
|
@ -426,8 +426,8 @@ object frmYSKInput: TfrmYSKInput
|
|||
object cxGrid1: TcxGrid
|
||||
Left = 0
|
||||
Top = 282
|
||||
Width = 1600
|
||||
Height = 414
|
||||
Width = 1592
|
||||
Height = 406
|
||||
Align = alClient
|
||||
TabOrder = 3
|
||||
object Tv1: TcxGridDBTableView
|
||||
|
|
@ -456,6 +456,7 @@ object frmYSKInput: TfrmYSKInput
|
|||
Kind = skSum
|
||||
end>
|
||||
DataController.Summary.SummaryGroups = <>
|
||||
OptionsBehavior.GoToNextCellOnEnter = True
|
||||
OptionsCustomize.ColumnFiltering = False
|
||||
OptionsData.Deleting = False
|
||||
OptionsData.DeletingConfirmation = False
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ begin
|
|||
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
|
||||
|
|
|
|||
|
|
@ -75,11 +75,11 @@ begin
|
|||
SetLength(pswd, 255);
|
||||
if trim(DataBaseStr) = '' then
|
||||
begin
|
||||
server := '121.40.233.100,7781';
|
||||
server := '139.196.56.206,7781';
|
||||
// server := '.';
|
||||
dtbase := 'sanshuidata';
|
||||
user := 'sa';
|
||||
pswd := 'rightsoft@123';
|
||||
user := 'sanshuisa';
|
||||
pswd := 'rightsoft@8599';
|
||||
// pswd := 'rightsoft';
|
||||
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
|
||||
// DName:='ADMIN';
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Label10: TLabel
|
||||
Left = 77
|
||||
Top = 382
|
||||
Top = 372
|
||||
Width = 40
|
||||
Height = 23
|
||||
Caption = #27491#21697
|
||||
|
|
@ -553,7 +553,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Label12: TLabel
|
||||
Left = 184
|
||||
Top = 382
|
||||
Top = 372
|
||||
Width = 40
|
||||
Height = 22
|
||||
Caption = #27425#21697
|
||||
|
|
@ -566,7 +566,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Label26: TLabel
|
||||
Left = 77
|
||||
Top = 433
|
||||
Top = 423
|
||||
Width = 40
|
||||
Height = 22
|
||||
Caption = #20986#32440
|
||||
|
|
@ -631,7 +631,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Label34: TLabel
|
||||
Left = 184
|
||||
Top = 433
|
||||
Top = 423
|
||||
Width = 40
|
||||
Height = 22
|
||||
Caption = #20221#25968
|
||||
|
|
@ -767,10 +767,10 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
OnKeyPress = MJstr3KeyPress
|
||||
end
|
||||
object BTPrint: TButton
|
||||
Left = 85
|
||||
Top = 471
|
||||
Width = 80
|
||||
Height = 45
|
||||
Left = 16
|
||||
Top = 461
|
||||
Width = 209
|
||||
Height = 106
|
||||
Caption = #25552#20132
|
||||
Font.Charset = GB2312_CHARSET
|
||||
Font.Color = clWindowText
|
||||
|
|
@ -782,8 +782,8 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
OnClick = BTPrintClick
|
||||
end
|
||||
object Button5: TButton
|
||||
Left = 181
|
||||
Top = 471
|
||||
Left = 248
|
||||
Top = 461
|
||||
Width = 80
|
||||
Height = 45
|
||||
Caption = #37325#25171
|
||||
|
|
@ -799,7 +799,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Edit3: TEdit
|
||||
Left = 118
|
||||
Top = 372
|
||||
Top = 362
|
||||
Width = 40
|
||||
Height = 43
|
||||
Font.Charset = GB2312_CHARSET
|
||||
|
|
@ -816,7 +816,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Edit4: TEdit
|
||||
Left = 222
|
||||
Top = 372
|
||||
Top = 362
|
||||
Width = 40
|
||||
Height = 43
|
||||
Font.Charset = GB2312_CHARSET
|
||||
|
|
@ -832,7 +832,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object Edit6: TEdit
|
||||
Left = 118
|
||||
Top = 423
|
||||
Top = 413
|
||||
Width = 40
|
||||
Height = 43
|
||||
Font.Charset = GB2312_CHARSET
|
||||
|
|
@ -881,7 +881,7 @@ object frmMarkingInspection: TfrmMarkingInspection
|
|||
end
|
||||
object ComboBox1: TComboBox
|
||||
Left = 222
|
||||
Top = 424
|
||||
Top = 414
|
||||
Width = 40
|
||||
Height = 40
|
||||
Style = csDropDownList
|
||||
|
|
|
|||
|
|
@ -10,7 +10,20 @@ uses
|
|||
cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
|
||||
RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
|
||||
ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
|
||||
MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator;
|
||||
MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 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
|
||||
TfrmMarkingInspection = class(TForm)
|
||||
|
|
@ -1148,7 +1161,10 @@ begin
|
|||
end;
|
||||
|
||||
if CheckData('Ìá½»') = False then
|
||||
begin
|
||||
BTPrint.Enabled := True;
|
||||
exit;
|
||||
end;
|
||||
|
||||
if SaveData() then
|
||||
begin
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user