diff --git a/F04染色刷卡/DyeProcess.dpr b/F04染色刷卡/DyeProcess.dpr
index 9ae8f6a..7edf311 100644
--- a/F04染色刷卡/DyeProcess.dpr
+++ b/F04染色刷卡/DyeProcess.dpr
@@ -20,7 +20,7 @@ uses
U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
U_CompanySel in '..\A00ͨô\U_CompanySel.pas' {frmCompanySel},
U_DataLink in 'U_DataLink.pas' {DataLink_DyeProcess: TDataModule},
- U_DyeOutputList in 'U_DyeOutputList.pas' {frmDyeOutputList},
+ U_DyePCList in 'U_DyePCList.pas' {frmDyePCList},
U_DyeOutput in 'U_DyeOutput.pas' {frmDyeOutput},
uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
diff --git a/F04染色刷卡/DyeProcess.dproj b/F04染色刷卡/DyeProcess.dproj
index 356db8b..78e24f8 100644
--- a/F04染色刷卡/DyeProcess.dproj
+++ b/F04染色刷卡/DyeProcess.dproj
@@ -118,8 +118,8 @@
dfm
TDataModule
-
-
+
+
dfm
diff --git a/F04染色刷卡/DyeProcess.dproj.local b/F04染色刷卡/DyeProcess.dproj.local
index f55a4aa..475e28e 100644
--- a/F04染色刷卡/DyeProcess.dproj.local
+++ b/F04染色刷卡/DyeProcess.dproj.local
@@ -1,25 +1,27 @@
- 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
- 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
- 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
- 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899/12/30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas
- 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
- 1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas
- 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
- 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
- 1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj
- 1899/12/30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=
- 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
- 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
- 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
- 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
- 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
- 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
- 2025/06/28 17:17:29.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas
+ 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
+ 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
+ 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
+ 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
+ 1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas
+ 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
+ 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
+ 1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas
+ 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
+ 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
+ 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
+ 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
+ 1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=
+ 1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj
+ 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
+ 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
+ 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
+ 2025-06-28 17:17:29.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas
+ 2025-08-01 15:46:35.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas
+ 2025-08-01 15:46:35.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm
@@ -43,16 +45,16 @@
+
-
-
-
+
+
diff --git a/F04染色刷卡/DyeProcess.identcache b/F04染色刷卡/DyeProcess.identcache
index 2ea9ef6..46a55f3 100644
Binary files a/F04染色刷卡/DyeProcess.identcache and b/F04染色刷卡/DyeProcess.identcache differ
diff --git a/F04染色刷卡/U_DyePCList.dfm b/F04染色刷卡/U_DyePCList.dfm
new file mode 100644
index 0000000..0c8daed
--- /dev/null
+++ b/F04染色刷卡/U_DyePCList.dfm
@@ -0,0 +1,630 @@
+inherited frmDyePCList: TfrmDyePCList
+ Caption = #25490#20135#20449#24687
+ ClientHeight = 584
+ ClientWidth = 1145
+ Color = clBtnFace
+ Font.Charset = DEFAULT_CHARSET
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ OldCreateOrder = True
+ WindowState = wsMaximized
+ ExplicitWidth = 1161
+ ExplicitHeight = 623
+ PixelsPerInch = 96
+ TextHeight = 13
+ object ToolBar1: TToolBar [0]
+ Tag = 1
+ Left = 0
+ Top = 0
+ Width = 1145
+ Height = 38
+ AutoSize = True
+ ButtonHeight = 38
+ ButtonWidth = 96
+ Caption = 'ToolBar1'
+ Color = clSkyBlue
+ DisabledImages = DataLink_DyeProcess.ImageList_new32
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -12
+ Font.Name = #23435#20307
+ Font.Style = []
+ Images = DataLink_DyeProcess.ImageList_new32
+ List = True
+ ParentColor = False
+ ParentFont = False
+ ShowCaptions = True
+ TabOrder = 0
+ object TBRafresh: TToolButton
+ Left = 0
+ Top = 0
+ AutoSize = True
+ Caption = #21047#26032
+ ImageIndex = 1
+ OnClick = TBRafreshClick
+ end
+ object TBFind: TToolButton
+ Left = 71
+ Top = 0
+ AutoSize = True
+ Caption = #36807#28388
+ ImageIndex = 0
+ OnClick = TBFindClick
+ end
+ object TBPrint: TToolButton
+ Left = 142
+ Top = 0
+ AutoSize = True
+ Caption = #25171#21360
+ ImageIndex = 21
+ Visible = False
+ end
+ object TBExport: TToolButton
+ Left = 213
+ Top = 0
+ AutoSize = True
+ Caption = #23548#20986'Excel'
+ ImageIndex = 20
+ OnClick = TBExportClick
+ end
+ object ToolButton1: TToolButton
+ Left = 313
+ Top = 0
+ AutoSize = True
+ Caption = #20445#23384#26684#24335
+ ImageIndex = 16
+ OnClick = ToolButton1Click
+ end
+ object TBClose: TToolButton
+ Left = 408
+ Top = 0
+ AutoSize = True
+ Caption = #20851#38381
+ ImageIndex = 7
+ OnClick = TBCloseClick
+ end
+ end
+ object Panel1: TPanel [1]
+ Left = 0
+ Top = 38
+ Width = 1145
+ Height = 64
+ Align = alTop
+ BevelInner = bvRaised
+ BevelOuter = bvLowered
+ Color = clSkyBlue
+ TabOrder = 1
+ object Label3: TLabel
+ Left = 252
+ Top = 36
+ Width = 48
+ Height = 13
+ Caption = #27969#31243#21345#21495
+ end
+ object Label1: TLabel
+ Left = 24
+ Top = 12
+ Width = 48
+ Height = 13
+ Caption = #21047#21345#26085#26399
+ end
+ object Label2: TLabel
+ Left = 64
+ Top = 36
+ Width = 12
+ Height = 13
+ Caption = #33267
+ end
+ object Label5: TLabel
+ Left = 252
+ Top = 12
+ Width = 48
+ Height = 13
+ Caption = #35745#21010#21333#21495
+ end
+ object Label10: TLabel
+ Left = 504
+ Top = 36
+ Width = 3
+ Height = 13
+ end
+ object Label16: TLabel
+ Left = 576
+ Top = 12
+ Width = 24
+ Height = 13
+ Caption = #24037#24207
+ end
+ object Label13: TLabel
+ Left = 288
+ Top = 128
+ Width = 24
+ Height = 13
+ Caption = #23458#25143
+ end
+ object Label17: TLabel
+ Left = 440
+ Top = 128
+ Width = 36
+ Height = 13
+ Caption = #19994#21153#21592
+ end
+ object Label4: TLabel
+ Left = 428
+ Top = 12
+ Width = 24
+ Height = 13
+ Caption = #39068#33394
+ end
+ object Label6: TLabel
+ Left = 428
+ Top = 36
+ Width = 24
+ Height = 13
+ Caption = #33394#21495
+ end
+ object Label7: TLabel
+ Left = 604
+ Top = 124
+ Width = 36
+ Height = 13
+ Caption = #33457#22411#21495
+ end
+ object Label9: TLabel
+ Left = 576
+ Top = 36
+ Width = 24
+ Height = 13
+ Caption = #29677#32452
+ end
+ object pcid: TEdit
+ Tag = 2
+ Left = 302
+ Top = 32
+ Width = 80
+ Height = 21
+ TabOrder = 0
+ OnChange = pcidChange
+ end
+ object BegDate: TDateTimePicker
+ Left = 73
+ Top = 8
+ Width = 90
+ Height = 20
+ Date = 40768.000000000000000000
+ Time = 0.458268587972270300
+ TabOrder = 1
+ end
+ object EndDate: TDateTimePicker
+ Left = 73
+ Top = 32
+ Width = 90
+ Height = 20
+ Date = 40768.000000000000000000
+ Time = 0.458268587972270300
+ TabOrder = 2
+ end
+ object orderNo: TEdit
+ Tag = 2
+ Left = 302
+ Top = 8
+ Width = 80
+ Height = 21
+ TabOrder = 3
+ OnChange = pcidChange
+ end
+ object customerNoName: TEdit
+ Tag = 2
+ Left = 314
+ Top = 124
+ Width = 100
+ Height = 21
+ TabOrder = 4
+ OnChange = pcidChange
+ end
+ object ywy: TEdit
+ Tag = 2
+ Left = 478
+ Top = 124
+ Width = 100
+ Height = 21
+ TabOrder = 5
+ OnChange = pcidChange
+ end
+ object C_Color: TEdit
+ Tag = 2
+ Left = 454
+ Top = 8
+ Width = 80
+ Height = 21
+ TabOrder = 6
+ OnChange = pcidChange
+ end
+ object C_ColorNo: TEdit
+ Tag = 2
+ Left = 454
+ Top = 32
+ Width = 80
+ Height = 21
+ TabOrder = 7
+ OnChange = pcidChange
+ end
+ object lbHx: TEdit
+ Tag = 2
+ Left = 642
+ Top = 120
+ Width = 80
+ Height = 21
+ TabOrder = 8
+ OnChange = pcidChange
+ end
+ object GlideName: TComboBox
+ Tag = 2
+ Left = 602
+ Top = 8
+ Width = 80
+ Height = 21
+ Style = csDropDownList
+ TabOrder = 9
+ OnChange = pcidChange
+ end
+ object StaffName: TEdit
+ Tag = 2
+ Left = 602
+ Top = 32
+ Width = 80
+ Height = 21
+ TabOrder = 10
+ OnChange = pcidChange
+ end
+ object begtime: TDateTimePicker
+ Left = 157
+ Top = 8
+ Width = 55
+ Height = 20
+ Date = 39780.000000000000000000
+ Format = 'HH:mm'
+ Time = 39780.000000000000000000
+ Kind = dtkTime
+ TabOrder = 11
+ end
+ object endTime: TDateTimePicker
+ Left = 157
+ Top = 32
+ Width = 55
+ Height = 20
+ Date = 39780.000000000000000000
+ Format = 'HH:mm'
+ Time = 0.999317129630071600
+ Kind = dtkTime
+ TabOrder = 12
+ end
+ end
+ object MovePanel2: TMovePanel [2]
+ Left = 351
+ Top = 244
+ Width = 289
+ Height = 49
+ BevelInner = bvLowered
+ Caption = #27491#22312#26597#35810#25968#25454#65292#35831#31245#21518#12290#12290#12290
+ Color = clSkyBlue
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clRed
+ Font.Height = -14
+ Font.Name = #23435#20307
+ Font.Style = [fsBold]
+ ParentFont = False
+ TabOrder = 2
+ Visible = False
+ end
+ object dbGrid1: TcxGrid [3]
+ Left = 0
+ Top = 102
+ Width = 1145
+ Height = 485
+ Align = alTop
+ TabOrder = 3
+ LookAndFeel.ScrollbarMode = sbmHybrid
+ LookAndFeel.ScrollMode = scmDefault
+ ExplicitLeft = -218
+ ExplicitTop = 99
+ ExplicitWidth = 1363
+ object tv1: TcxGridDBTableView
+ Tag = 9999
+ DragMode = dmAutomatic
+ Navigator.Buttons.CustomButtons = <>
+ FindPanel.DisplayMode = fpdmAlways
+ FindPanel.UseExtendedSyntax = True
+ ScrollbarAnnotations.CustomAnnotations = <>
+ DataController.DataSource = DataSource1
+ DataController.Filter.AutoDataSetFilter = True
+ DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+ DataController.Summary.DefaultGroupSummaryItems = <>
+ DataController.Summary.FooterSummaryItems = <>
+ DataController.Summary.SummaryGroups = <>
+ DateTimeHandling.Grouping = dtgByDate
+ OptionsData.Deleting = False
+ OptionsData.Editing = False
+ OptionsData.Inserting = False
+ OptionsView.Footer = True
+ OptionsView.GroupByBox = False
+ OptionsView.Indicator = True
+ object tv1CraftIdx: TcxGridDBColumn
+ DataBinding.FieldName = 'CraftIdx'
+ DataBinding.IsNullValueType = True
+ Visible = False
+ end
+ object tv1mcName: TcxGridDBColumn
+ Caption = #26426#32568
+ DataBinding.FieldName = 'mcName'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 99
+ end
+ object tv1runStatus: TcxGridDBColumn
+ Tag = 99
+ Caption = #29366#24577
+ DataBinding.FieldName = 'runStatus'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 64
+ end
+ object tv1lastMinNum: TcxGridDBColumn
+ Caption = #19982#19978#32568#38388#38548'('#20998')'
+ DataBinding.FieldName = 'lastMinNum'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 125
+ end
+ object tv1curDoInfo: TcxGridDBColumn
+ Caption = #24403#21069#29983#20135
+ DataBinding.FieldName = 'curDoInfo'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 114
+ end
+ object tv1curInTime: TcxGridDBColumn
+ Caption = #26412#32568#36827#32568#26102#38388
+ DataBinding.FieldName = 'curInTime'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 117
+ end
+ object tv1runTime: TcxGridDBColumn
+ Caption = #24050#25345#32493'(h)'
+ DataBinding.FieldName = 'runTime'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Options.Focusing = False
+ Width = 80
+ end
+ object tv1Column1: TcxGridDBColumn
+ Caption = #39044#35745#20986#32568
+ DataBinding.IsNullValueType = True
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 85
+ end
+ object tv1wait1: TcxGridDBColumn
+ Caption = #31561#24453'1'
+ DataBinding.FieldName = 'wait1'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1wait2: TcxGridDBColumn
+ Caption = #31561#24453'2'
+ DataBinding.FieldName = 'wait2'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1wait3: TcxGridDBColumn
+ Caption = #31561#24453'3'
+ DataBinding.FieldName = 'wait3'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1wait4: TcxGridDBColumn
+ Caption = #31561#24453'4'
+ DataBinding.FieldName = 'wait4'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1wait5: TcxGridDBColumn
+ Caption = #31561#24453'5'
+ DataBinding.FieldName = 'wait5'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1wait6: TcxGridDBColumn
+ Caption = #31561#24453'6'
+ DataBinding.FieldName = 'wait6'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 100
+ end
+ object tv1finish1: TcxGridDBColumn
+ Caption = #23436'1'
+ DataBinding.FieldName = 'finish1'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Options.Focusing = False
+ Width = 63
+ end
+ object tv1finish2: TcxGridDBColumn
+ Caption = #23436'2'
+ DataBinding.FieldName = 'finish2'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Options.Focusing = False
+ Width = 61
+ end
+ object tv1finish3: TcxGridDBColumn
+ Caption = #23436'3'
+ DataBinding.FieldName = 'finish3'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Width = 70
+ end
+ object tv1GC_BatchNo: TcxGridDBColumn
+ Caption = #22383#24067#25209#27425
+ DataBinding.FieldName = 'GC_BatchNo'
+ DataBinding.IsNullValueType = True
+ Visible = False
+ HeaderAlignmentHorz = taCenter
+ Options.Filtering = False
+ Width = 89
+ end
+ object tv1finish4: TcxGridDBColumn
+ Caption = #23436'4'
+ DataBinding.FieldName = 'finish4'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 92
+ end
+ object tv1finish5: TcxGridDBColumn
+ Caption = #23436'5'
+ DataBinding.FieldName = 'finish5'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 103
+ end
+ object tv1finish6: TcxGridDBColumn
+ Caption = #23436'6'
+ DataBinding.FieldName = 'finish6'
+ DataBinding.IsNullValueType = True
+ FixedKind = fkLeftDynamic
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 61
+ end
+ object tv1CurGlideName: TcxGridDBColumn
+ Caption = #21047#21345#36827#24230
+ DataBinding.FieldName = 'CurGlideName'
+ DataBinding.IsNullValueType = True
+ Visible = False
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Focusing = False
+ Width = 62
+ end
+ object tv1Note: TcxGridDBColumn
+ Caption = #22791#27880
+ DataBinding.FieldName = 'Note'
+ DataBinding.IsNullValueType = True
+ Visible = False
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Options.Filtering = False
+ Options.Focusing = False
+ Width = 109
+ end
+ end
+ object dbGrid1Level1: TcxGridLevel
+ GridView = tv1
+ end
+ end
+ inherited ADOQueryBaseCmd: TADOQuery
+ Connection = DataLink_DyeProcess.ADOLink
+ end
+ inherited ADOQueryBaseTemp: TADOQuery
+ Connection = DataLink_DyeProcess.ADOLink
+ end
+ object ADOQueryCmd: TADOQuery
+ Connection = DataLink_DyeProcess.ADOLink
+ Parameters = <>
+ Left = 788
+ Top = 168
+ end
+ object ADOQueryMain: TADOQuery
+ Connection = DataLink_DyeProcess.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 852
+ Top = 280
+ end
+ object ADOQueryTemp: TADOQuery
+ Connection = DataLink_DyeProcess.ADOLink
+ LockType = ltReadOnly
+ Parameters = <>
+ Left = 764
+ Top = 288
+ end
+ object DataSource1: TDataSource
+ DataSet = CDS_Main
+ Left = 896
+ Top = 360
+ end
+ object cxGridPopupMenu1: TcxGridPopupMenu
+ PopupMenus = <>
+ Left = 888
+ Top = 144
+ end
+ object CDS_Main: TClientDataSet
+ Aggregates = <>
+ Params = <>
+ Left = 768
+ Top = 376
+ end
+ object RMGridReport1: TRMGridReport
+ ThreadPrepareReport = True
+ InitialZoom = pzDefault
+ PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
+ DefaultCollate = False
+ SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+ PreviewOptions.RulerUnit = rmutScreenPixels
+ PreviewOptions.RulerVisible = False
+ PreviewOptions.DrawBorder = False
+ PreviewOptions.BorderPen.Color = clGray
+ PreviewOptions.BorderPen.Style = psDash
+ CompressLevel = rmzcFastest
+ CompressThread = False
+ LaterBuildEvents = True
+ OnlyOwnerDataSet = False
+ Left = 720
+ Top = 136
+ ReportData = {}
+ end
+end
diff --git a/F04染色刷卡/U_DyePCList.pas b/F04染色刷卡/U_DyePCList.pas
new file mode 100644
index 0000000..d68a6a8
--- /dev/null
+++ b/F04染色刷卡/U_DyePCList.pas
@@ -0,0 +1,274 @@
+unit U_DyePCList;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+ Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+ cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+ cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
+ cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
+ ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
+ cxDropDownEdit, MovePanel, cxButtonEdit, cxCalendar, RM_System, RM_Common,
+ RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
+ dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
+ U_BaseList, dxScrollbarAnnotations;
+
+type
+ TfrmDyePCList = class(TfrmBaseList)
+ ToolBar1: TToolBar;
+ TBRafresh: TToolButton;
+ TBFind: TToolButton;
+ TBExport: TToolButton;
+ TBPrint: TToolButton;
+ TBClose: TToolButton;
+ Panel1: TPanel;
+ ADOQueryCmd: TADOQuery;
+ ADOQueryMain: TADOQuery;
+ ADOQueryTemp: TADOQuery;
+ DataSource1: TDataSource;
+ cxGridPopupMenu1: TcxGridPopupMenu;
+ Label3: TLabel;
+ pcid: TEdit;
+ Label1: TLabel;
+ Label2: TLabel;
+ BegDate: TDateTimePicker;
+ EndDate: TDateTimePicker;
+ CDS_Main: TClientDataSet;
+ Label5: TLabel;
+ orderNo: TEdit;
+ MovePanel2: TMovePanel;
+ Label10: TLabel;
+ RMGridReport1: TRMGridReport;
+ Label16: TLabel;
+ customerNoName: TEdit;
+ Label13: TLabel;
+ ywy: TEdit;
+ Label17: TLabel;
+ C_Color: TEdit;
+ Label4: TLabel;
+ C_ColorNo: TEdit;
+ Label6: TLabel;
+ lbHx: TEdit;
+ Label7: TLabel;
+ GlideName: TComboBox;
+ StaffName: TEdit;
+ Label9: TLabel;
+ begtime: TDateTimePicker;
+ endTime: TDateTimePicker;
+ ToolButton1: TToolButton;
+ dbGrid1: TcxGrid;
+ tv1: TcxGridDBTableView;
+ tv1CraftIdx: TcxGridDBColumn;
+ tv1mcName: TcxGridDBColumn;
+ tv1runStatus: TcxGridDBColumn;
+ tv1lastMinNum: TcxGridDBColumn;
+ tv1curDoInfo: TcxGridDBColumn;
+ tv1curInTime: TcxGridDBColumn;
+ tv1runTime: TcxGridDBColumn;
+ tv1Column1: TcxGridDBColumn;
+ tv1wait1: TcxGridDBColumn;
+ tv1wait2: TcxGridDBColumn;
+ tv1wait3: TcxGridDBColumn;
+ tv1wait4: TcxGridDBColumn;
+ tv1wait5: TcxGridDBColumn;
+ tv1wait6: TcxGridDBColumn;
+ tv1finish1: TcxGridDBColumn;
+ tv1finish2: TcxGridDBColumn;
+ tv1finish3: TcxGridDBColumn;
+ tv1GC_BatchNo: TcxGridDBColumn;
+ tv1finish4: TcxGridDBColumn;
+ tv1finish5: TcxGridDBColumn;
+ tv1finish6: TcxGridDBColumn;
+ tv1CurGlideName: TcxGridDBColumn;
+ tv1Note: TcxGridDBColumn;
+ dbGrid1Level1: TcxGridLevel;
+ procedure FormDestroy(Sender: TObject);
+ procedure FormClose(Sender: TObject; var Action: TCloseAction);
+ procedure FormCreate(Sender: TObject);
+ procedure TBRafreshClick(Sender: TObject);
+ procedure ConNoMChange(Sender: TObject);
+ procedure TBCloseClick(Sender: TObject);
+ procedure FormShow(Sender: TObject);
+ procedure TBExportClick(Sender: TObject);
+ procedure TBFindClick(Sender: TObject);
+ procedure pcidChange(Sender: TObject);
+ procedure PRTColorChange(Sender: TObject);
+ procedure TBdelClick(Sender: TObject);
+ procedure ToolButton1Click(Sender: TObject);
+
+ private
+ FLeft, FTop: Integer;
+ procedure InitGrid();
+ { Private declarations }
+ public
+ fsyrName, canshu1: string;
+ { Public declarations }
+ end;
+
+var
+ frmDyePCList: TfrmDyePCList;
+
+implementation
+
+uses
+ U_DataLink, U_RTFun, U_ZDYHelp;
+
+{$R *.dfm}
+
+procedure TfrmDyePCList.FormDestroy(Sender: TObject);
+begin
+ inherited;
+ frmDyePCList := nil;
+end;
+
+procedure TfrmDyePCList.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+ inherited;
+ Action := caFree;
+end;
+
+procedure TfrmDyePCList.FormCreate(Sender: TObject);
+begin
+ inherited;
+
+ EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
+ BegDate.DateTime := EndDate.DateTime;
+ fsyrName := trim(DdataBase);
+ canshu1 := trim(DParameters1);
+ SInitComBoxBySql(ADOQueryTemp, GlideName, false, 'select PSName as Name from Dye_Process');
+end;
+
+procedure TfrmDyePCList.InitGrid();
+var
+ Msql, mbegdate, menddate: string;
+begin
+ Msql := '';
+ if SGetFilters(Panel1, 1, 2) <> '' then
+ Msql := Msql + ' and ' + SGetFilters(Panel1, 1, 2);
+ mbegdate := FormatDateTime('yyyy-MM-dd', begdate.Date) + ' ' + FormatDateTime('HH:nn', begTime.Time);
+ menddate := FormatDateTime('yyyy-MM-dd', enddate.Date) + ' ' + FormatDateTime('HH:nn', endTime.Time);
+ try
+ ADOQueryMain.DisableControls;
+ with ADOQueryMain do
+ begin
+ Close;
+ sql.Clear;
+ Filtered := False;
+// sql.Add('select GOID,A.GlideName,Qty,rollnum,groupName,B.*,a.filler as filler2,a.filltime as filltime2,gotime,QtyUnit,StaffName from Dye_Plan_Glide_OutPut A ');
+ sql.Add('select * from V_Dye_Plan_Glide_OutPut A');
+ sql.Add('inner join Dye_Plan_Card B on A.PCID=B.PCID ');
+ sql.add('where A.GOTime>=''' + trim(mbegdate) + ''' ');
+ sql.Add('and A.GOTime<''' + trim(menddate) + ''' ');
+ sql.Add(Msql);
+ // showmessage(sql.Text);
+ Open;
+ end;
+ SCreateCDS(ADOQueryMain, CDS_Main);
+ SInitCDSData(ADOQueryMain, CDS_Main);
+ finally
+ ADOQueryMain.EnableControls;
+ end;
+ TBFind.Click;
+end;
+
+procedure TfrmDyePCList.TBRafreshClick(Sender: TObject);
+begin
+ MovePanel2.Visible := True;
+ MovePanel2.Refresh;
+ InitGrid();
+ MovePanel2.Visible := False;
+end;
+
+procedure TfrmDyePCList.ToolButton1Click(Sender: TObject);
+begin
+ WriteCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ');
+end;
+
+procedure TfrmDyePCList.ConNoMChange(Sender: TObject);
+begin
+ if ADOQueryMain.Active then
+ begin
+ SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+ end;
+end;
+
+procedure TfrmDyePCList.TBCloseClick(Sender: TObject);
+begin
+
+ Close;
+end;
+
+procedure TfrmDyePCList.FormShow(Sender: TObject);
+begin
+ inherited;
+ ReadCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ');
+ canshu1 := self.fParameters1;
+
+ initgrid();
+end;
+
+procedure TfrmDyePCList.TBExportClick(Sender: TObject);
+begin
+ if ADOQueryMain.IsEmpty then
+ exit;
+// SelExportData(tv1,ADOQueryMain,self.Caption);
+ TcxGridToExcel(self.Caption, DBGrid1);
+end;
+
+procedure TfrmDyePCList.TBFindClick(Sender: TObject);
+begin
+ if ADOQueryMain.Active then
+ begin
+ SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+ SCreateCDS(ADOQueryMain, CDS_Main);
+ SInitCDSData(ADOQueryMain, CDS_Main);
+ end;
+end;
+
+procedure TfrmDyePCList.pcidChange(Sender: TObject);
+begin
+ TBFind.Click;
+end;
+
+procedure TfrmDyePCList.PRTColorChange(Sender: TObject);
+begin
+ TBFind.Click;
+end;
+
+procedure TfrmDyePCList.TBdelClick(Sender: TObject);
+begin
+ if CDS_Main.IsEmpty then
+ Exit;
+
+ if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then
+ Exit;
+ try
+ with ADOQueryCmd do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('insert into Dye_Need_Up(UType,UDataId) values(''̨ˢ'',' + quotedstr(Trim(CDS_Main.fieldbyname('GOID').AsString)) + ') ');
+ sql.Add('delete Dye_Plan_Glide_OutPut where GOID=''' + Trim(CDS_Main.fieldbyname('GOID').AsString) + '''');
+
+ ExecSQL;
+ end;
+////////////////// ½ //////////////////
+ with ADOQueryCmd do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('exec P_Dye_Card_upCL @PCID=' + QuotedStr(CDS_Main.fieldbyname('pcid').AsString));
+
+ execsql;
+ end;
+////////////////// ½ //////////////////
+ CDS_Main.Delete;
+ except
+ application.MessageBox('ɾʧܣ', 'ʾϢ', 0);
+ end;
+
+end;
+
+end.
+
diff --git a/F04染色刷卡/U_GetDllForm.pas b/F04染色刷卡/U_GetDllForm.pas
index 3101983..6cff925 100644
--- a/F04染色刷卡/U_GetDllForm.pas
+++ b/F04染色刷卡/U_GetDllForm.pas
@@ -15,7 +15,7 @@ function GetsysParam(muserId: pchar; fparam1: pchar): Boolean;
implementation
uses
- U_DataLink, U_iniParam, U_DyeOutput, U_DyeOutputList;
+ U_DataLink, U_iniParam, U_DyeOutput, U_DyeOutputList, U_DyePCList;
/////////////////////////////////////////////////////////////////
// ˵:ȡDllеô //
@@ -123,7 +123,17 @@ begin
/////////////////////
//ģ鴰
case FormID of
-
+ 1: //̨Ų
+ begin
+ with TfrmDyePCList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do //
+ begin
+ fFormID := FormID;
+ FormStyle := mstyle;
+ WindowState := mstate;
+ BorderStyle := mborderstyle;
+ mnewHandle := Handle;
+ end;
+ end;
211: //Ǽ
begin
with TfrmDyeOutput.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do //
diff --git a/F04染色刷卡/testDll.res b/F04染色刷卡/testDll.res
index e116c48..2465ca0 100644
Binary files a/F04染色刷卡/testDll.res and b/F04染色刷卡/testDll.res differ