diff --git a/云翔一码通/U_YMTFHSQInPut.dfm b/云翔一码通/U_YMTFHSQInPut.dfm index bfd991c..9c78497 100644 --- a/云翔一码通/U_YMTFHSQInPut.dfm +++ b/云翔一码通/U_YMTFHSQInPut.dfm @@ -1,24 +1,24 @@ object frmFHSQInPut: TfrmFHSQInPut Left = 354 - Top = 585 - Width = 1113 + Top = 296 + Width = 1499 Height = 664 Caption = #21457#36135#30003#35831#24405#20837 Color = clBtnFace Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -15 Font.Name = #23435#20307 Font.Style = [] OldCreateOrder = False Position = poScreenCenter OnShow = FormShow - PixelsPerInch = 96 - TextHeight = 12 + PixelsPerInch = 120 + TextHeight = 15 object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1105 + Width = 1491 Height = 29 ButtonHeight = 30 ButtonWidth = 75 @@ -58,8 +58,8 @@ object frmFHSQInPut: TfrmFHSQInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1105 - Height = 111 + Width = 1491 + Height = 139 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -70,102 +70,102 @@ object frmFHSQInPut: TfrmFHSQInPut TabOrder = 1 object Label1: TLabel Tag = 1 - Left = 33 - Top = 12 - Width = 90 - Height = 17 + Left = 41 + Top = 15 + Width = 115 + Height = 22 Caption = #20986#24211#31867#22411#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label12: TLabel Tag = 1 - Left = 39 - Top = 78 - Width = 84 - Height = 17 + Left = 49 + Top = 98 + Width = 105 + Height = 22 Caption = #22791' '#27880#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label11: TLabel Tag = 1 - Left = 380 - Top = 12 - Width = 90 - Height = 17 + Left = 475 + Top = 15 + Width = 115 + Height = 22 Caption = #25910#36135#21333#20301#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label2: TLabel Tag = 1 - Left = 380 - Top = 43 - Width = 90 - Height = 17 + Left = 475 + Top = 54 + Width = 115 + Height = 22 Caption = #30003#35831#26085#26399#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label5: TLabel Tag = 1 - Left = 51 - Top = 43 - Width = 72 - Height = 17 + Left = 64 + Top = 54 + Width = 92 + Height = 22 Caption = #19994#21153#21592#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label3: TLabel Tag = 1 - Left = 849 - Top = 12 - Width = 72 - Height = 17 + Left = 1061 + Top = 15 + Width = 92 + Height = 22 Caption = #21152#24037#31867#22411 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object CRType: TComboBox Tag = 1 - Left = 115 - Top = 8 - Width = 250 - Height = 25 + Left = 144 + Top = 10 + Width = 312 + Height = 30 Style = csDropDownList Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 - ItemHeight = 17 + ItemHeight = 22 ParentFont = False TabOrder = 0 Items.Strings = ( @@ -178,13 +178,13 @@ object frmFHSQInPut: TfrmFHSQInPut end object Note: TEdit Tag = 1 - Left = 115 - Top = 75 - Width = 714 + Left = 144 + Top = 94 + Width = 892 Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -193,14 +193,14 @@ object frmFHSQInPut: TfrmFHSQInPut end object SHDanWei: TBtnEditC Tag = 1 - Left = 455 - Top = 7 - Width = 373 + Left = 569 + Top = 9 + Width = 466 Height = 26 Hint = 'KHNo' Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 @@ -211,10 +211,10 @@ object frmFHSQInPut: TfrmFHSQInPut end object SQDate: TDateTimePicker Tag = 1 - Left = 455 - Top = 39 - Width = 130 - Height = 25 + Left = 569 + Top = 49 + Width = 162 + Height = 30 BevelInner = bvNone Date = 43473.670856296290000000 Format = 'yyyy-MM-dd' @@ -222,7 +222,7 @@ object frmFHSQInPut: TfrmFHSQInPut Checked = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -231,13 +231,13 @@ object frmFHSQInPut: TfrmFHSQInPut end object Salesman: TBtnEditC Tag = 1 - Left = 115 - Top = 38 - Width = 135 + Left = 144 + Top = 48 + Width = 169 Height = 26 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -248,13 +248,13 @@ object frmFHSQInPut: TfrmFHSQInPut end object JGType: TEdit Tag = 1 - Left = 931 - Top = 8 - Width = 120 + Left = 1164 + Top = 10 + Width = 150 Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -264,8 +264,8 @@ object frmFHSQInPut: TfrmFHSQInPut end object ToolBar2: TToolBar Left = 0 - Top = 140 - Width = 1105 + Top = 168 + Width = 1491 Height = 29 ButtonHeight = 30 ButtonWidth = 95 @@ -304,9 +304,9 @@ object frmFHSQInPut: TfrmFHSQInPut end object cxGrid1: TcxGrid Left = 0 - Top = 169 - Width = 1105 - Height = 464 + Top = 197 + Width = 1491 + Height = 430 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView diff --git a/云翔一码通/U_YMTFHSQInPut.pas b/云翔一码通/U_YMTFHSQInPut.pas index 997b509..6dc4629 100644 --- a/云翔一码通/U_YMTFHSQInPut.pas +++ b/云翔一码通/U_YMTFHSQInPut.pas @@ -96,7 +96,7 @@ var implementation uses - U_DataLink, U_ZDYHelp, U_RTFun, U_YMTKHList, U_YMTOrderSel, U_YMTGYSList; + U_DataLink, U_ZDYHelp, U_RTFun, U_YMTOrderSel, U_ZdyAttachKH, U_ZdyAttachGYS; // U_YMTKHList, , U_YMTGYSList {$R *.dfm} @@ -377,37 +377,37 @@ begin if CRType.Text = 'ӹ' then begin try - frmGYSList := TfrmGYSList.Create(Application); - with frmGYSList do + frmZdyAttachGYS := TfrmZdyAttachGYS.Create(Application); + with frmZdyAttachGYS do begin if ShowModal = 1 then begin - Self.SHDanWei.Text := Trim(Order_Main.fieldbyname('KHNameJC').AsString); - Self.SHDanWei.TxtCode := Trim(Order_Main.fieldbyname('KHNo').AsString); - Self.Salesman.Text := Trim(Order_Main.fieldbyname('YWY').AsString); + Self.SHDanWei.Text := Trim(frmZdyAttachGYS.CDS_HZ.fieldbyname('KHNameJC').AsString); + Self.SHDanWei.TxtCode := Trim(frmZdyAttachGYS.CDS_HZ.fieldbyname('KHNo').AsString); + Self.Salesman.Text := Trim(frmZdyAttachGYS.CDS_HZ.fieldbyname('YWY').AsString); end; end; finally - frmGYSList.Free; + frmZdyAttachGYS.Free; end; end else begin try - frmKHList_CX := TfrmKHList_CX.Create(Application); - with frmKHList_CX do + frmZdyAttachkh := TfrmZdyAttachkh.Create(Application); + with frmZdyAttachkh do begin // if self.canshu1 <> 'Ȩ' then // canshu1 := 'ҵԱ'; if ShowModal = 1 then begin - Self.SHDanWei.Text := Trim(CDS_HZ.fieldbyname('KHNameJC').AsString); - Self.SHDanWei.TxtCode := Trim(CDS_HZ.fieldbyname('KHNo').AsString); - Self.Salesman.Text := Trim(CDS_HZ.fieldbyname('YWY').AsString); + Self.SHDanWei.Text := Trim(frmZdyAttachkh.CDS_HZ.fieldbyname('KHNameJC').AsString); + Self.SHDanWei.TxtCode := Trim(frmZdyAttachkh.CDS_HZ.fieldbyname('KHNo').AsString); + Self.Salesman.Text := Trim(frmZdyAttachkh.CDS_HZ.fieldbyname('YWY').AsString); end; end; finally - frmKHList_CX.Free; + frmZdyAttachkh.Free; end; end; end; diff --git a/云翔一码通/U_YMTFHSQList.dfm b/云翔一码通/U_YMTFHSQList.dfm index 888bf92..d55f586 100644 --- a/云翔一码通/U_YMTFHSQList.dfm +++ b/云翔一码通/U_YMTFHSQList.dfm @@ -7,7 +7,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList Color = clBtnFace Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -15 Font.Name = #23435#20307 Font.Style = [] OldCreateOrder = False @@ -15,8 +15,8 @@ object frmYMTFHSQList: TfrmYMTFHSQList OnCreate = FormCreate OnDestroy = FormDestroy OnShow = FormShow - PixelsPerInch = 96 - TextHeight = 12 + PixelsPerInch = 120 + TextHeight = 15 object ToolBar1: TToolBar Left = 0 Top = 0 @@ -121,9 +121,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object cxGrid1: TcxGrid Left = 0 - Top = 109 + Top = 128 Width = 1300 - Height = 281 + Height = 194 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -291,6 +291,13 @@ object frmYMTFHSQList: TfrmYMTFHSQList Styles.Header = DataLink_YXYMT.Default Width = 81 end + object Tv1Column1: TcxGridDBColumn + Caption = #23457#26680#29366#24577 + DataBinding.FieldName = 'ChkStatus' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 71 + end object v1OrdDate: TcxGridDBColumn Caption = #30003#35831#21457#36135#26085#26399 DataBinding.FieldName = 'SQDate' @@ -366,88 +373,88 @@ object frmYMTFHSQList: TfrmYMTFHSQList Left = 0 Top = 32 Width = 1300 - Height = 77 + Height = 96 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 object Label1: TLabel - Left = 23 - Top = 15 - Width = 72 - Height = 17 + Left = 29 + Top = 19 + Width = 92 + Height = 22 Caption = #30003#35831#26085#26399 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label4: TLabel - Left = 274 - Top = 15 - Width = 72 - Height = 17 + Left = 343 + Top = 19 + Width = 92 + Height = 22 Caption = #25910#36135#21333#20301 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label5: TLabel - Left = 292 - Top = 45 - Width = 54 - Height = 17 + Left = 365 + Top = 56 + Width = 69 + Height = 22 Caption = #19994#21153#21592 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label2: TLabel - Left = 85 - Top = 45 - Width = 10 - Height = 17 + Left = 106 + Top = 56 + Width = 12 + Height = 22 Caption = '-' Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label3: TLabel - Left = 469 - Top = 45 - Width = 72 - Height = 17 + Left = 586 + Top = 19 + Width = 92 + Height = 22 Caption = #23457#26680#29366#24577 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object BegDate: TDateTimePicker - Left = 94 - Top = 11 - Width = 125 - Height = 25 + Left = 126 + Top = 15 + Width = 156 + Height = 30 Date = 40675.464742650460000000 Format = 'yyyy-MM-dd' Time = 40675.464742650460000000 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -456,16 +463,16 @@ object frmYMTFHSQList: TfrmYMTFHSQList OnChange = BegDateChange end object EndDate: TDateTimePicker - Left = 94 - Top = 41 - Width = 126 - Height = 25 + Left = 126 + Top = 52 + Width = 157 + Height = 30 Date = 40675.464761099540000000 Format = 'yyyy-MM-dd' Time = 40675.464761099540000000 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -475,13 +482,13 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object SHDanWei: TEdit Tag = 2 - Left = 348 - Top = 11 - Width = 98 + Left = 435 + Top = 17 + Width = 123 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -491,13 +498,13 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object Salesman: TEdit Tag = 2 - Left = 348 - Top = 41 - Width = 96 + Left = 435 + Top = 54 + Width = 120 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 @@ -507,16 +514,16 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object ComboBox1: TComboBox Tag = 7 - Left = 543 - Top = 41 - Width = 101 - Height = 25 + Left = 679 + Top = 15 + Width = 126 + Height = 30 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] - ItemHeight = 17 + ItemHeight = 22 ItemIndex = 0 ParentFont = False TabOrder = 4 @@ -529,7 +536,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object cxSplitter1: TcxSplitter Left = 0 - Top = 390 + Top = 322 Width = 1300 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' @@ -538,9 +545,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object cxGrid2: TcxGrid Left = 0 - Top = 398 + Top = 330 Width = 1300 - Height = 250 + Height = 312 Align = alBottom TabOrder = 4 object Tv2: TcxGridDBTableView @@ -673,52 +680,52 @@ object frmYMTFHSQList: TfrmYMTFHSQList end end object Panel3: TPanel - Left = 488 - Top = 188 - Width = 234 - Height = 97 + Left = 610 + Top = 235 + Width = 293 + Height = 121 Color = clSkyBlue TabOrder = 5 Visible = False object Label25: TLabel - Left = 24 - Top = 12 - Width = 48 - Height = 12 + Left = 30 + Top = 15 + Width = 60 + Height = 15 Caption = #20986#24211#31867#22411 end object btnChk: TButton - Left = 28 - Top = 57 - Width = 60 - Height = 25 + Left = 35 + Top = 71 + Width = 75 + Height = 32 Caption = #30830#35748 TabOrder = 0 OnClick = btnChkClick end object Button3: TButton - Left = 160 - Top = 57 - Width = 60 - Height = 25 + Left = 200 + Top = 71 + Width = 75 + Height = 32 Caption = #20851#38381 TabOrder = 1 OnClick = Button3Click end object CRType: TComboBox Tag = 1 - Left = 79 - Top = 8 - Width = 139 - Height = 25 + Left = 99 + Top = 10 + Width = 174 + Height = 30 Style = csDropDownList Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861 - ItemHeight = 17 + ItemHeight = 22 ParentFont = False TabOrder = 2 Items.Strings = ( @@ -733,45 +740,45 @@ object frmYMTFHSQList: TfrmYMTFHSQList object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid1 PopupMenus = <> - Left = 1000 - Top = 184 + Left = 514 + Top = 337 end object ADOQueryCmd: TADOQuery Connection = DataLink_YXYMT.ADOLink Parameters = <> - Left = 488 - Top = 152 + Left = 514 + Top = 215 end object ADOQueryMain: TADOQuery Connection = DataLink_YXYMT.ADOLink LockType = ltReadOnly Parameters = <> - Left = 652 - Top = 144 + Left = 575 + Top = 215 end object ADOQueryTemp: TADOQuery Connection = DataLink_YXYMT.ADOLink LockType = ltReadOnly Parameters = <> - Left = 684 - Top = 144 + Left = 758 + Top = 215 end object DataSource1: TDataSource DataSet = Order_Main - Left = 968 - Top = 184 + Left = 697 + Top = 337 end object Order_Main: TClientDataSet Aggregates = <> Params = <> - Left = 532 - Top = 320 + Left = 758 + Top = 276 end object RMDB_Main: TRMDBDataSet Visible = True DataSet = ADOQueryPrint - Left = 312 - Top = 256 + Left = 575 + Top = 398 end object RMXLSExport1: TRMXLSExport ShowAfterExport = True @@ -784,50 +791,50 @@ object frmYMTFHSQList: TfrmYMTFHSQList ScaleX = 1.000000000000000000 ScaleY = 1.000000000000000000 CompressFile = False - Left = 375 - Top = 184 + Left = 697 + Top = 398 end object ADOQueryPrint: TADOQuery Connection = DataLink_YXYMT.ADOLink LockType = ltReadOnly Parameters = <> - Left = 280 - Top = 256 + Left = 636 + Top = 215 end object CDS_Print: TClientDataSet Aggregates = <> Params = <> - Left = 216 - Top = 200 + Left = 636 + Top = 276 end object ADOQuerySub: TADOQuery Connection = DataLink_YXYMT.ADOLink Parameters = <> - Left = 720 - Top = 144 + Left = 697 + Top = 215 end object DataSource2: TDataSource DataSet = ClientDataSet2 - Left = 464 - Top = 504 + Left = 758 + Top = 337 end object ClientDataSet2: TClientDataSet Aggregates = <> Params = <> - Left = 496 - Top = 504 + Left = 697 + Top = 276 end object cxGridPopupMenu2: TcxGridPopupMenu Grid = cxGrid2 PopupMenus = <> - Left = 528 - Top = 504 + Left = 575 + Top = 337 end object CDS_Note: TClientDataSet Aggregates = <> Params = <> - Left = 408 - Top = 184 + Left = 575 + Top = 276 end object RM1: TRMGridReport ThreadPrepareReport = True @@ -845,15 +852,15 @@ object frmYMTFHSQList: TfrmYMTFHSQList CompressThread = False LaterBuildEvents = True OnlyOwnerDataSet = False - Left = 352 - Top = 256 + Left = 636 + Top = 398 ReportData = {} end object CDSUser: TClientDataSet Aggregates = <> Params = <> - Left = 440 - Top = 240 + Left = 514 + Top = 276 end object IdHTTP1: TIdHTTP MaxLineAction = maException @@ -869,13 +876,13 @@ object frmYMTFHSQList: TfrmYMTFHSQList Request.BasicAuthentication = False Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)' HTTPOptions = [hoForceEncodeParams] - Left = 660 - Top = 308 + Left = 514 + Top = 398 end object cxStyleRepository1: TcxStyleRepository - Left = 16 - Top = 112 - PixelsPerInch = 96 + Left = 636 + Top = 337 + PixelsPerInch = 120 object cxStyle1: TcxStyle AssignedValues = [svFont] Font.Charset = ANSI_CHARSET diff --git a/云翔一码通/U_YMTFHSQList.pas b/云翔一码通/U_YMTFHSQList.pas index 4f63152..589b713 100644 --- a/云翔一码通/U_YMTFHSQList.pas +++ b/云翔一码通/U_YMTFHSQList.pas @@ -109,6 +109,7 @@ type Button3: TButton; CRType: TComboBox; v1Column6: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -540,8 +541,8 @@ begin sql.Add('where FSID=' + quotedstr(trim(Order_Main.fieldbyname('FSID').AsString))); execsql; end; - Order_Main.Delete; - InitSubGrid(); +// Order_Main.Delete; + InitGrid(); application.MessageBox('˳ɹ', 'ʾϢ'); except application.MessageBox('ʧܣ', 'ʾϢ', 0); @@ -596,8 +597,8 @@ begin sql.Add('where FSID=' + quotedstr(trim(Order_Main.fieldbyname('FSID').AsString))); execsql; end; - Order_Main.Delete; - InitSubGrid(); +// Order_Main.Delete; + InitGrid(); application.MessageBox('ɹ', 'ʾϢ'); except application.MessageBox('ʧܣ', 'ʾϢ', 0); diff --git a/云翔一码通/U_YMTOrderSel.dfm b/云翔一码通/U_YMTOrderSel.dfm index d1a81c8..1cfbfc6 100644 --- a/云翔一码通/U_YMTOrderSel.dfm +++ b/云翔一码通/U_YMTOrderSel.dfm @@ -7,7 +7,7 @@ object frmOrderSel: TfrmOrderSel Color = clBtnFace Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -15 Font.Name = #23435#20307 Font.Style = [] OldCreateOrder = False @@ -16,8 +16,8 @@ object frmOrderSel: TfrmOrderSel OnCreate = FormCreate OnDestroy = FormDestroy OnShow = FormShow - PixelsPerInch = 96 - TextHeight = 12 + PixelsPerInch = 120 + TextHeight = 15 object ToolBar1: TToolBar Left = 0 Top = 0 @@ -68,131 +68,131 @@ object frmOrderSel: TfrmOrderSel Left = 0 Top = 32 Width = 1320 - Height = 70 + Height = 88 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 object Label1: TLabel - Left = 25 - Top = 14 - Width = 72 - Height = 17 + Left = 31 + Top = 18 + Width = 92 + Height = 22 Caption = #19979#21333#26085#26399 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label3: TLabel - Left = 473 - Top = 41 - Width = 72 - Height = 17 + Left = 591 + Top = 51 + Width = 92 + Height = 22 Caption = #25351#31034#21333#21495 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label4: TLabel - Left = 239 - Top = 14 - Width = 76 - Height = 17 + Left = 299 + Top = 18 + Width = 94 + Height = 22 Caption = #23458' '#25143 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label9: TLabel - Left = 473 - Top = 14 - Width = 74 - Height = 17 + Left = 591 + Top = 18 + Width = 93 + Height = 22 Caption = #21512' '#21516' '#21495 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label12: TLabel - Left = 613 - Top = 119 - Width = 26 - Height = 12 + Left = 766 + Top = 149 + Width = 32 + Height = 15 Caption = #20811#37325 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -15 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label5: TLabel - Left = 239 - Top = 41 - Width = 72 - Height = 17 + Left = 299 + Top = 51 + Width = 92 + Height = 22 Caption = #20135#21697#21517#31216 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label7: TLabel - Left = 525 - Top = 88 - Width = 52 - Height = 12 + Left = 656 + Top = 110 + Width = 64 + Height = 15 Caption = #23457#26680#29366#24577 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -15 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False Visible = False end object BegDate: TDateTimePicker - Left = 100 - Top = 10 - Width = 123 - Height = 25 + Left = 125 + Top = 13 + Width = 154 + Height = 30 Date = 40675.464742650460000000 Format = 'yyyy-MM-dd' Time = 40675.464742650460000000 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False TabOrder = 0 end object EndDate: TDateTimePicker - Left = 100 - Top = 37 - Width = 123 - Height = 25 + Left = 125 + Top = 46 + Width = 154 + Height = 30 Date = 40675.464761099540000000 Format = 'yyyy-MM-dd' Time = 40675.464761099540000000 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -200,13 +200,13 @@ object frmOrderSel: TfrmOrderSel end object MLOrderNo: TEdit Tag = 2 - Left = 552 - Top = 37 - Width = 120 + Left = 690 + Top = 46 + Width = 150 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -216,13 +216,13 @@ object frmOrderSel: TfrmOrderSel end object KHNameHZ: TEdit Tag = 2 - Left = 317 - Top = 10 - Width = 140 + Left = 396 + Top = 13 + Width = 175 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -231,13 +231,13 @@ object frmOrderSel: TfrmOrderSel end object MLConNo: TEdit Tag = 2 - Left = 552 - Top = 10 - Width = 120 + Left = 690 + Top = 13 + Width = 150 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -247,21 +247,21 @@ object frmOrderSel: TfrmOrderSel end object MPRTKZ: TEdit Tag = 2 - Left = 654 - Top = 99 - Width = 56 + Left = 818 + Top = 124 + Width = 70 Height = 20 TabOrder = 5 end object MLCodeName: TEdit Tag = 2 - Left = 317 - Top = 37 - Width = 139 + Left = 396 + Top = 46 + Width = 174 Height = 25 Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -17 + Font.Height = -22 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -271,11 +271,11 @@ object frmOrderSel: TfrmOrderSel end object status: TComboBox Tag = 2 - Left = 581 - Top = 87 - Width = 103 - Height = 20 - ItemHeight = 12 + Left = 726 + Top = 109 + Width = 129 + Height = 23 + ItemHeight = 15 TabOrder = 7 Visible = False Items.Strings = ( @@ -287,7 +287,7 @@ object frmOrderSel: TfrmOrderSel end object cxSplitter1: TcxSplitter Left = 0 - Top = 648 + Top = 642 Width = 1320 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' @@ -296,9 +296,9 @@ object frmOrderSel: TfrmOrderSel end object cxGrid2: TcxGrid Left = 0 - Top = 102 + Top = 120 Width = 1320 - Height = 546 + Height = 522 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView diff --git a/云翔一码通/U_YMTOrderSel.pas b/云翔一码通/U_YMTOrderSel.pas index 94d20e4..4c3205f 100644 --- a/云翔一码通/U_YMTOrderSel.pas +++ b/云翔一码通/U_YMTOrderSel.pas @@ -261,45 +261,45 @@ begin if CDS_Main.fieldbyname('SSel').AsBoolean = True then begin - if (Trim(FFTT) = '') and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then - begin - FFTT := Trim(CDS_Main.fieldbyname('SYRName').AsString); - end; - - if Trim(FFKHName) = '' then - begin - FFKHName := Trim(CDS_Main.fieldbyname('KHName').AsString); - end; +// if (Trim(FFTT) = '') and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then +// begin +// FFTT := Trim(CDS_Main.fieldbyname('SYRName').AsString); +// end; +// +// if Trim(FFKHName) = '' then +// begin +// FFKHName := Trim(CDS_Main.fieldbyname('KHName').AsString); +// end; //ͬʱѡ̧ܰͷ - if (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> FFTT) and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then - begin - Application.MessageBox('ѡ̧ͷ!', 'ʾ', 0); - exit; - end; +// if (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> FFTT) and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then +// begin +// Application.MessageBox('ѡ̧ͷ!', 'ʾ', 0); +// exit; +// end; //ѡ̧ͷܺѾѡ̧ͷͬ - if (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> FTT) and (FTT <> '') and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then - begin - Application.MessageBox('ѡ̧ͷ!', 'ʾ', 0); - exit; - end; +// if (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> FTT) and (FTT <> '') and (Trim(CDS_Main.fieldbyname('SYRName').AsString) <> '') then +// begin +// Application.MessageBox('ѡ̧ͷ!', 'ʾ', 0); +// exit; +// end; //ͬʱѡܰͻ - if (Trim(CDS_Main.fieldbyname('KHName').AsString) <> FFKHName) then - begin - Application.MessageBox('ѡͻ!', 'ʾ', 0); - exit; - end; +// if (Trim(CDS_Main.fieldbyname('KHName').AsString) <> FFKHName) then +// begin +// Application.MessageBox('ѡͻ!', 'ʾ', 0); +// exit; +// end; //ѡܺѾѡĿͻͬ - if (Trim(CDS_Main.fieldbyname('KHNo').AsString) <> FKHNo) and (FKHNo <> '') then - begin - Application.MessageBox('ѡͻ!', 'ʾ', 0); - exit; - end; +// if (Trim(CDS_Main.fieldbyname('KHNo').AsString) <> FKHNo) and (FKHNo <> '') then +// begin +// Application.MessageBox('ѡͻ!', 'ʾ', 0); +// exit; +// end; end; diff --git a/云翔一码通/U_YMTRKInPut.dfm b/云翔一码通/U_YMTRKInPut.dfm index 2053ddf..a760605 100644 --- a/云翔一码通/U_YMTRKInPut.dfm +++ b/云翔一码通/U_YMTRKInPut.dfm @@ -1,7 +1,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut - Left = 165 - Top = 270 - Width = 1829 + Left = -65 + Top = 225 + Width = 1876 Height = 623 Align = alClient Caption = #22238#20179#20837#24211 @@ -20,7 +20,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut object cxGrid2: TcxGrid Left = 0 Top = 33 - Width = 1585 + Width = 1544 Height = 553 Align = alClient TabOrder = 0 @@ -257,6 +257,13 @@ object frmYMTRKInPut: TfrmYMTRKInPut HeaderAlignmentHorz = taCenter Width = 63 end + object Tv1Column3: TcxGridDBColumn + Tag = 2 + Caption = #37325#37327 + DataBinding.FieldName = 'KGQty' + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #25968#37327#21333#20301 @@ -291,6 +298,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + HeaderAlignmentHorz = taCenter Width = 79 end end @@ -301,7 +309,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1821 + Width = 1868 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -538,19 +546,19 @@ object frmYMTRKInPut: TfrmYMTRKInPut end end object Panel2: TPanel - Left = 1585 + Left = 1544 Top = 33 - Width = 236 + Width = 324 Height = 553 Align = alRight Caption = 'Panel2' TabOrder = 3 object cxGrid1: TcxGrid - Left = -11 + Left = 1 Top = 1 - Width = 246 + Width = 322 Height = 551 - Align = alRight + Align = alClient TabOrder = 0 object TvMX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> @@ -582,6 +590,10 @@ object frmYMTRKInPut: TfrmYMTRKInPut item Kind = skSum Column = TvMXMXQty + end + item + Kind = skSum + Column = TvMXColumn1 end> DataController.Summary.SummaryGroups = <> OptionsBehavior.GoToNextCellOnEnter = True @@ -595,7 +607,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut Caption = #32534#21495 DataBinding.FieldName = 'MXID' HeaderAlignmentHorz = taCenter - Width = 80 + Width = 99 end object TvMXMXQty: TcxGridDBColumn Caption = #25968#37327 @@ -606,6 +618,12 @@ object frmYMTRKInPut: TfrmYMTRKInPut Options.Sorting = False Width = 80 end + object TvMXColumn1: TcxGridDBColumn + Caption = #37325#37327 + DataBinding.FieldName = 'KGQty' + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGridLevel2: TcxGridLevel GridView = TvMX diff --git a/云翔一码通/U_YMTRKInPut.pas b/云翔一码通/U_YMTRKInPut.pas index f5a727d..a7f0bb1 100644 --- a/云翔一码通/U_YMTRKInPut.pas +++ b/云翔一码通/U_YMTRKInPut.pas @@ -88,6 +88,8 @@ type cxGridLevel2: TcxGridLevel; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + TvMXColumn1: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/云翔一码通/U_YMTRKList.dfm b/云翔一码通/U_YMTRKList.dfm index 1ec6012..3c6b2ec 100644 --- a/云翔一码通/U_YMTRKList.dfm +++ b/云翔一码通/U_YMTRKList.dfm @@ -2,7 +2,7 @@ object frmYMTRKList: TfrmYMTRKList Left = 267 Top = 100 Width = 1370 - Height = 750 + Height = 700 Caption = #38754#26009#22238#20179#30331#35760 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -363,8 +363,8 @@ object frmYMTRKList: TfrmYMTRKList object cxGrid2: TcxGrid Left = 0 Top = 123 - Width = 1049 - Height = 590 + Width = 1008 + Height = 540 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -398,11 +398,16 @@ object frmYMTRKList: TfrmYMTRKList item Format = '#,###' Kind = skSum + end + item + Kind = skSum + Column = Tv1Column4 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False OptionsView.Footer = True OptionsView.GroupByBox = False + OptionsView.Indicator = True Styles.Inactive = DataLink_YXYMT.SHuangSe Styles.IncSearch = DataLink_YXYMT.SHuangSe Styles.Selection = DataLink_YXYMT.SHuangSe @@ -412,7 +417,7 @@ object frmYMTRKList: TfrmYMTRKList DataBinding.FieldName = 'SSel' PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter - Width = 40 + Width = 47 end object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 @@ -459,6 +464,12 @@ object frmYMTRKList: TfrmYMTRKList Options.Editing = False Width = 102 end + object Tv1Column3: TcxGridDBColumn + Caption = #23458#25143 + DataBinding.FieldName = 'CustomerNoName' + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column14: TcxGridDBColumn Tag = 2 Caption = #20379#24212#21830 @@ -578,7 +589,7 @@ object frmYMTRKList: TfrmYMTRKList Properties.DisplayFormat = '0.00;' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 67 + Width = 32 end object v2Column6: TcxGridDBColumn Tag = 2 @@ -587,7 +598,13 @@ object frmYMTRKList: TfrmYMTRKList PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 85 + Width = 62 + end + object Tv1Column4: TcxGridDBColumn + Caption = #37325#37327 + DataBinding.FieldName = 'KgQty' + HeaderAlignmentHorz = taCenter + Width = 80 end object Tv1Column1: TcxGridDBColumn Caption = #21333#20215 @@ -631,6 +648,7 @@ object frmYMTRKList: TfrmYMTRKList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 end @@ -640,18 +658,18 @@ object frmYMTRKList: TfrmYMTRKList end end object Panel2: TPanel - Left = 1049 + Left = 1008 Top = 123 - Width = 313 - Height = 590 + Width = 354 + Height = 540 Align = alRight Caption = 'Panel2' TabOrder = 3 object cxGrid1: TcxGrid Left = 1 Top = 82 - Width = 311 - Height = 507 + Width = 352 + Height = 457 Align = alClient TabOrder = 0 object TvMX: TcxGridDBTableView @@ -684,6 +702,10 @@ object frmYMTRKList: TfrmYMTRKList item Kind = skSum Column = TvMXMXQty + end + item + Kind = skSum + Column = TvMXColumn1 end> DataController.Summary.SummaryGroups = <> OptionsBehavior.GoToNextCellOnEnter = True @@ -691,7 +713,7 @@ object frmYMTRKList: TfrmYMTRKList OptionsView.Footer = True OptionsView.GroupByBox = False OptionsView.Indicator = True - OptionsView.IndicatorWidth = 33 + OptionsView.IndicatorWidth = 20 OnCustomDrawIndicatorCell = TvMXCustomDrawIndicatorCell object TvMXSsel: TcxGridDBColumn Caption = #36873#25321 @@ -715,6 +737,12 @@ object frmYMTRKList: TfrmYMTRKList Options.Sorting = False Width = 80 end + object TvMXColumn1: TcxGridDBColumn + Caption = #37325#37327 + DataBinding.FieldName = 'KgQty' + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGridLevel2: TcxGridLevel GridView = TvMX @@ -723,7 +751,7 @@ object frmYMTRKList: TfrmYMTRKList object ToolBar2: TToolBar Left = 1 Top = 53 - Width = 311 + Width = 352 Height = 29 ButtonHeight = 30 ButtonWidth = 80 @@ -752,7 +780,7 @@ object frmYMTRKList: TfrmYMTRKList object Panel3: TPanel Left = 1 Top = 1 - Width = 311 + Width = 352 Height = 52 Align = alTop TabOrder = 2 diff --git a/云翔一码通/U_YMTRKList.pas b/云翔一码通/U_YMTRKList.pas index b01c39b..b269e5b 100644 --- a/云翔一码通/U_YMTRKList.pas +++ b/云翔一码通/U_YMTRKList.pas @@ -132,6 +132,9 @@ type KuWei: TcxButtonEdit; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + TvMXColumn1: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject);