diff --git a/项目代码/DJ/A01基础公司管理/Company.dproj.local b/项目代码/DJ/A01基础公司管理/Company.dproj.local index a8fa49f..9519ffa 100644 --- a/项目代码/DJ/A01基础公司管理/Company.dproj.local +++ b/项目代码/DJ/A01基础公司管理/Company.dproj.local @@ -1,63 +1,35 @@  - 1899-12-30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas - 1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas - 1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas - 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm - 1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm - 1899-12-30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm + 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas + 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas 1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas - 1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas - 1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas - 1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas - 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm + 1899-12-30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas + 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas + 1899-12-30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas + 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= + 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm + 1899-12-30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas 1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas + 1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas + 1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas + 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= + 1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas + 1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas + 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm + 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -71,7 +43,7 @@ - + diff --git a/项目代码/DJ/A01基础公司管理/Company.identcache b/项目代码/DJ/A01基础公司管理/Company.identcache index c60ab80..3caa147 100644 Binary files a/项目代码/DJ/A01基础公司管理/Company.identcache and b/项目代码/DJ/A01基础公司管理/Company.identcache differ diff --git a/项目代码/DJ/A01基础公司管理/ProjectGroup1.groupproj.local b/项目代码/DJ/A01基础公司管理/ProjectGroup1.groupproj.local index 6720e4e..c411fe7 100644 --- a/项目代码/DJ/A01基础公司管理/ProjectGroup1.groupproj.local +++ b/项目代码/DJ/A01基础公司管理/ProjectGroup1.groupproj.local @@ -2,6 +2,6 @@ - + diff --git a/项目代码/DJ/A01基础公司管理/testDll.identcache b/项目代码/DJ/A01基础公司管理/testDll.identcache index 7d754eb..4a2cd06 100644 Binary files a/项目代码/DJ/A01基础公司管理/testDll.identcache and b/项目代码/DJ/A01基础公司管理/testDll.identcache differ diff --git a/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.dfm b/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.dfm index 6ce83c6..58c600c 100644 --- a/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.dfm +++ b/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.dfm @@ -195,7 +195,6 @@ inherited frmItemTestInPut: TfrmItemTestInPut DoubleBuffered = False ParentDoubleBuffered = False TabOrder = 2 - ExplicitTop = 31 object dxLayoutControl_bzplan: TdxLayoutControl Left = 0 Top = 0 @@ -596,7 +595,7 @@ inherited frmItemTestInPut: TfrmItemTestInPut Align = alClient TabOrder = 3 ExplicitLeft = -1 - ExplicitTop = 174 + ExplicitTop = 172 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -659,15 +658,6 @@ inherited frmItemTestInPut: TfrmItemTestInPut HeaderAlignmentHorz = taCenter Width = 80 end - object v1C_Code: TcxGridDBColumn - Caption = #20135#21697#32534#21495 - DataBinding.FieldName = 'C_Code' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1GramWeight: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'GramWeight' @@ -797,24 +787,6 @@ inherited frmItemTestInPut: TfrmItemTestInPut HeaderAlignmentHorz = taCenter Width = 80 end - object v1C_Spec: TcxGridDBColumn - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end - object v1AttName: TcxGridDBColumn - Caption = #33457#22411#22270#29255 - DataBinding.FieldName = 'AttName' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1WeftDamage: TcxGridDBColumn Caption = #32428#21521#25439#27585#38271#24230 DataBinding.FieldName = 'WeftDamage' @@ -831,24 +803,6 @@ inherited frmItemTestInPut: TfrmItemTestInPut HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1SLabVolume: TcxGridDBColumn - Caption = #21367#26631#31614 - DataBinding.FieldName = 'SLabVolume' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end - object Tv1SLabPackage: TcxGridDBColumn - Caption = #21253#26631#31614 - DataBinding.FieldName = 'SLabPackage' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1PToP: TcxGridDBColumn Caption = #28857#23545#28857#30005#38459 DataBinding.FieldName = 'PToP' diff --git a/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.pas b/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.pas index f3ee09f..0a03573 100644 --- a/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.pas +++ b/项目代码/DJ/G01贸易生产计划/U_ItemTestInPut.pas @@ -62,7 +62,6 @@ type Tv1: TcxGridDBTableView; Tv1RollNo: TcxGridDBColumn; Tv1Quantity: TcxGridDBColumn; - v1C_Code: TcxGridDBColumn; Tv1GramWeight: TcxGridDBColumn; Tv1FullWidth: TcxGridDBColumn; Tv1CutttableWidth: TcxGridDBColumn; @@ -75,8 +74,6 @@ type Tv1WeftTensile: TcxGridDBColumn; Tv1WaterProof: TcxGridDBColumn; Tv1WarpDamage: TcxGridDBColumn; - v1C_Spec: TcxGridDBColumn; - v1AttName: TcxGridDBColumn; Tv1WeftDamage: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; Gilding: TcxButtonEdit; @@ -99,8 +96,6 @@ type CustDefFloat2: TcxTextEdit; Tv1SSel: TcxGridDBColumn; Tv1PH: TcxGridDBColumn; - Tv1SLabVolume: TcxGridDBColumn; - Tv1SLabPackage: TcxGridDBColumn; ToolButton3: TToolButton; Tupimage: TToolButton; ToolButton4: TToolButton; @@ -819,7 +814,7 @@ begin CopyAddRow(Tv1, CDS_1); with CDS_1 do begin - Edit; + edit; fieldbyname('SSel').Value := false; FieldByName('RollNo').Value := CDS_1.RecordCount; //FieldByName('c_Name').Value := ''; diff --git a/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm b/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm index 5844f33..24619ba 100644 --- a/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm +++ b/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm @@ -7,7 +7,6 @@ inherited frmItemTestList: TfrmItemTestList Font.Height = -16 FormStyle = fsMDIChild Visible = True - ExplicitTop = -142 ExplicitWidth = 1306 ExplicitHeight = 751 PixelsPerInch = 96 @@ -393,7 +392,6 @@ inherited frmItemTestList: TfrmItemTestList object cxTabSheet1: TcxTabSheet Caption = #35270#22270 ImageIndex = 0 - ExplicitHeight = 427 object cxGrid1: TcxGrid Left = 4 Top = 10 @@ -1027,7 +1025,6 @@ inherited frmItemTestList: TfrmItemTestList HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom Control = cxGrid5 - ExplicitTop = 191 end object cxGrid2: TcxGrid Left = 0 @@ -1036,7 +1033,6 @@ inherited frmItemTestList: TfrmItemTestList Height = 228 Align = alBottom TabOrder = 3 - ExplicitLeft = 1 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm index b89adab..750f571 100644 --- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm +++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm @@ -222,23 +222,25 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut end object ConNo: TcxTextEdit Tag = 7 - Left = 446 + Left = 657 Top = 13 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 2 + TabOrder = 3 Width = 150 end object OrdDate: TcxDateEdit Tag = 2 - Left = 657 - Top = 13 + Left = 458 + Top = 49 + AutoSize = False Properties.SaveTime = False Properties.ShowTime = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 3 - Width = 131 + TabOrder = 6 + Height = 29 + Width = 148 end object DLYDate: TcxDateEdit Tag = 2 @@ -270,8 +272,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut end object factoryName: TcxButtonEdit Tag = 2 - Left = 446 - Top = 49 + Left = 10000 + Top = 10000 Hint = 'FtyName/'#21152#24037#21378 Properties.Buttons = < item @@ -282,13 +284,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = FtyNamePropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 6 + TabOrder = 28 + Visible = False Width = 150 end object Gilding: TcxButtonEdit Tag = 2 - Left = 67 - Top = 85 + Left = 10000 + Top = 10000 Hint = 'Gilding/'#28907#37329 Properties.Buttons = < item @@ -299,13 +302,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 7 + TabOrder = 23 + Visible = False Width = 131 end object PackSeal: TcxButtonEdit Tag = 2 - Left = 657 - Top = 85 + Left = 10000 + Top = 10000 Hint = 'PackSeal/'#23553#26465 Properties.Buttons = < item @@ -320,13 +324,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 10 + TabOrder = 24 + Visible = False Width = 131 end object ShippingSample: TcxButtonEdit Tag = 2 - Left = 247 - Top = 85 + Left = 458 + Top = 13 Hint = 'ShippingSample/'#33337#26679 AutoSize = False Properties.Buttons = < @@ -338,14 +343,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 8 + TabOrder = 2 Height = 29 Width = 150 end object SizeNote: TcxButtonEdit Tag = 2 - Left = 446 - Top = 85 + Left = 10000 + Top = 10000 Hint = 'SizeNote/'#24320#21098 Properties.Buttons = < item @@ -356,30 +361,31 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 9 + TabOrder = 26 + Visible = False Width = 150 end object OrdNote: TcxMemo Tag = 2 Left = 67 - Top = 241 - Properties.ScrollBars = ssVertical - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 14 - Height = 89 - Width = 721 - end - object PackNote: TcxMemo - Tag = 2 - Left = 67 - Top = 157 + Top = 205 Properties.ScrollBars = ssVertical Style.HotTrack = False Style.TransparentBorder = False TabOrder = 13 + Height = 89 + Width = 740 + end + object PackNote: TcxMemo + Tag = 2 + Left = 67 + Top = 121 + Properties.ScrollBars = ssVertical + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 12 Height = 77 - Width = 721 + Width = 740 end object PackType: TcxButtonEdit Tag = 2 @@ -400,7 +406,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 15 + TabOrder = 14 Visible = False Width = 131 end @@ -423,7 +429,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 16 + TabOrder = 15 Visible = False Width = 131 end @@ -446,7 +452,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 23 + TabOrder = 22 Visible = False Width = 131 end @@ -469,13 +475,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 17 + TabOrder = 16 Visible = False Width = 131 end object LabVolume: TcxButtonEdit - Left = 67 - Top = 121 + Left = 10000 + Top = 10000 Properties.Buttons = < item Default = True @@ -485,13 +491,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = LabVolumePropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 11 + TabOrder = 25 + Visible = False OnEnter = LabVolumeEnter Width = 183 end object LabPackage: TcxButtonEdit - Left = 299 - Top = 121 + Left = 10000 + Top = 10000 Properties.Buttons = < item Default = True @@ -501,7 +508,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = LabVolumePropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 12 + TabOrder = 27 + Visible = False OnEnter = LabPackageEnter Width = 162 end @@ -519,7 +527,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 20 + TabOrder = 19 Visible = False Width = 150 end @@ -537,7 +545,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 22 + TabOrder = 21 Visible = False Width = 150 end @@ -555,7 +563,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Properties.OnButtonClick = GildingPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 18 + TabOrder = 17 Visible = False Width = 150 end @@ -565,7 +573,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 19 + TabOrder = 18 Visible = False Width = 94 end @@ -575,15 +583,62 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 21 + TabOrder = 20 Visible = False Width = 82 end + object JYNo: TcxTextEdit + Tag = 2 + Left = 667 + Top = 49 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 7 + Width = 137 + end + object PB_Code: TcxTextEdit + Tag = 2 + Left = 67 + Top = 85 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 8 + Width = 155 + end + object PB_Spec: TcxTextEdit + Tag = 2 + Left = 283 + Top = 85 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 9 + Height = 29 + Width = 150 + end + object PB_Width: TcxTextEdit + Tag = 2 + Left = 470 + Top = 85 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 10 + Width = 150 + end + object PB_GramWeight: TcxTextEdit + Tag = 2 + Left = 657 + Top = 85 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 11 + Width = 150 + end object dxLayoutControl_bzplanGroup_Root: TdxLayoutGroup AlignHorz = ahLeft AlignVert = avTop Hidden = True - ItemIndex = 3 + ItemIndex = 2 ShowBorder = False Index = -1 end @@ -591,7 +646,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Parent = dxLayoutControl_bzplanGroup_Root CaptionOptions.Text = 'Hidden Group' Hidden = True - ItemIndex = 3 + ItemIndex = 2 LayoutDirection = ldHorizontal ShowBorder = False Index = 0 @@ -629,30 +684,32 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False - Index = 2 + Index = 3 end object dxLayoutItem5: TdxLayoutItem - Parent = dxLayoutGroup_1 + Parent = dxLayoutGroup_2 + AlignVert = avClient SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True + SizeOptions.Width = 202 AllowRemove = False CaptionOptions.Text = #25490#21333#26085#26399 Control = OrdDate ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 131 + ControlOptions.OriginalWidth = 148 ControlOptions.ShowBorder = False - Index = 3 + Index = 2 end object dxLayoutGroup_2: TdxLayoutGroup Parent = dxLayoutControl_bzplanGroup_Root CaptionOptions.Text = 'Hidden Group' Hidden = True + ItemIndex = 3 LayoutDirection = ldHorizontal ShowBorder = False Index = 1 end object dxLayoutItem2: TdxLayoutItem - Parent = dxLayoutGroup_2 SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True CaptionOptions.Text = #21152#24037#21378 @@ -660,12 +717,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False - Index = 2 + Index = -1 end object dxLayoutItem6: TdxLayoutItem Parent = dxLayoutGroup_2 SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True + SizeOptions.Width = 185 AllowRemove = False CaptionOptions.Text = #20132#36135#26085#26399 Control = DLYDate @@ -686,30 +744,20 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.ShowBorder = False Index = 1 end - object dxLayoutGroup_3: TdxLayoutGroup - Parent = dxLayoutControl_bzplanGroup_Root - CaptionOptions.Text = 'Hidden Group' - Hidden = True - ItemIndex = 3 - LayoutDirection = ldHorizontal - ShowBorder = False - Index = 2 - end object dxLayoutItem8: TdxLayoutItem - Parent = dxLayoutGroup_3 + Parent = dxLayoutGroup_1 AlignVert = avClient SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = False - CaptionOptions.Text = #33337' '#26679 + CaptionOptions.Text = #33853#33394#25968#37327 Control = ShippingSample ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False - Index = 1 + Index = 2 end object dxLayoutItem9: TdxLayoutItem - Parent = dxLayoutGroup_3 SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True CaptionOptions.Text = #28907' '#37329 @@ -717,10 +765,9 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False - Index = 0 + Index = -1 end object dxLayoutItem10: TdxLayoutItem - Parent = dxLayoutGroup_3 SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True CaptionOptions.Text = #24320' '#21098 @@ -728,10 +775,9 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False - Index = 2 + Index = -1 end object dxLayoutItem11: TdxLayoutItem - Parent = dxLayoutGroup_3 SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True CaptionOptions.Text = #23553' '#26465 @@ -739,7 +785,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False - Index = 3 + Index = -1 end object dxLayoutGroup_4: TdxLayoutGroup Parent = dxLayoutControl_bzplanGroup_Root @@ -747,14 +793,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Hidden = True ItemIndex = 1 ShowBorder = False - Index = 4 + Index = 3 end object dxLayoutItem12: TdxLayoutItem Parent = dxLayoutGroup_4 SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True - CaptionOptions.Text = #21253#35013#35201#27714 + CaptionOptions.Text = #26816#39564#35201#27714 Control = PackNote ControlOptions.OriginalHeight = 77 ControlOptions.OriginalWidth = 704 @@ -817,17 +863,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.ShowBorder = False Index = -1 end - object dxLayoutGroup_label: TdxLayoutGroup - Parent = dxLayoutControl_bzplanGroup_Root - CaptionOptions.Text = 'Hidden Group' - Hidden = True - ItemIndex = 1 - LayoutDirection = ldHorizontal - ShowBorder = False - Index = 3 - end object dxLayoutItem20: TdxLayoutItem - Parent = dxLayoutGroup_label SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True SizeOptions.Width = 237 @@ -836,10 +872,9 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 183 ControlOptions.ShowBorder = False - Index = 0 + Index = -1 end object dxLayoutItem21: TdxLayoutItem - Parent = dxLayoutGroup_label SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True SizeOptions.Width = 204 @@ -848,7 +883,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 162 ControlOptions.ShowBorder = False - Index = 1 + Index = -1 end object dxLayoutItem22: TdxLayoutItem SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] @@ -905,6 +940,75 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut ControlOptions.ShowBorder = False Index = -1 end + object dxLayoutItem_JYNo: TdxLayoutItem + Parent = dxLayoutGroup_2 + SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] + SizeOptions.SizableHorz = True + SizeOptions.SizableVert = True + SizeOptions.Width = 191 + CaptionOptions.Text = #26816#39564#21333#21495 + Control = JYNo + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 137 + ControlOptions.ShowBorder = False + Index = 3 + end + object dxLayoutItem_PB_Code: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup1 + AlignHorz = ahClient + SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] + SizeOptions.SizableHorz = True + SizeOptions.SizableVert = True + SizeOptions.Width = 65 + CaptionOptions.Text = #22383#24067#32534#21495 + Control = PB_Code + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 150 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutItem_PB_Spec: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup1 + AlignVert = avClient + SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] + SizeOptions.SizableHorz = True + SizeOptions.SizableVert = True + CaptionOptions.Text = #22383#24067#35268#26684 + Control = PB_Spec + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 150 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup + Parent = dxLayoutControl_bzplanGroup_Root + LayoutDirection = ldHorizontal + Index = 2 + end + object dxLayoutItem_PB_Width: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup1 + SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] + SizeOptions.SizableHorz = True + SizeOptions.SizableVert = True + CaptionOptions.Text = #38376#24133 + Control = PB_Width + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 150 + ControlOptions.ShowBorder = False + Index = 2 + end + object dxLayoutItem_C_GramWeight: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup1 + SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] + SizeOptions.SizableHorz = True + SizeOptions.SizableVert = True + CaptionOptions.Text = #20811#37325 + Control = PB_GramWeight + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 150 + ControlOptions.ShowBorder = False + Index = 3 + end end object dxLayoutControl_other: TdxLayoutControl Left = 926 diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas index 4047764..a941804 100644 --- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas +++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas @@ -85,7 +85,6 @@ type v1AttName: TcxGridDBColumn; Tv1batchNo: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; - dxLayoutGroup_3: TdxLayoutGroup; dxLayoutItem8: TdxLayoutItem; dxLayoutItem9: TdxLayoutItem; dxLayoutItem10: TdxLayoutItem; @@ -121,7 +120,6 @@ type dxLayoutItem17: TdxLayoutItem; dxLayoutItem18: TdxLayoutItem; dxLayoutItem19: TdxLayoutItem; - dxLayoutGroup_label: TdxLayoutGroup; dxLayoutItem20: TdxLayoutItem; dxLayoutItem21: TdxLayoutItem; RMPreview1: TRMPreview; @@ -161,6 +159,17 @@ type Timport: TToolButton; CDS_LM: TClientDataSet; Tv1BatchNoQty: TcxGridDBColumn; + JYNo: TcxTextEdit; + PB_Code: TcxTextEdit; + PB_Spec: TcxTextEdit; + PB_Width: TcxTextEdit; + PB_GramWeight: TcxTextEdit; + dxLayoutItem_JYNo: TdxLayoutItem; + dxLayoutItem_PB_Code: TdxLayoutItem; + dxLayoutItem_PB_Spec: TdxLayoutItem; + dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup; + dxLayoutItem_PB_Width: TdxLayoutItem; + dxLayoutItem_C_GramWeight: TdxLayoutItem; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm index 8cd0da2..acfaf0a 100644 --- a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm +++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm @@ -425,7 +425,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList ImageIndex = 0 object cxGrid1: TcxGrid Left = 17 - Top = 3 + Top = 2 Width = 1040 Height = 246 TabOrder = 0 @@ -585,6 +585,46 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Options.Editing = False Width = 77 end + object Tv1PB_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'PB_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1PB_Spec: TcxGridDBColumn + Caption = #22383#24067#35268#26684 + DataBinding.FieldName = 'PB_Spec' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1PB_Width: TcxGridDBColumn + Caption = #38376#24133 + DataBinding.FieldName = 'PB_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1PB_GramWeight: TcxGridDBColumn + Caption = #20811#37325 + DataBinding.FieldName = 'PB_GramWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1JYNo: TcxGridDBColumn + Caption = #26816#39564#21333#21495 + DataBinding.FieldName = 'JYNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object tv1ordNote: TcxGridDBColumn Caption = #22791#27880#35201#27714 DataBinding.FieldName = 'ordNote' diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas index b0592a3..f32a6ce 100644 --- a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas +++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas @@ -209,6 +209,11 @@ type TV2Column11: TcxGridDBColumn; TV2Column12: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; + Tv1PB_Code: TcxGridDBColumn; + Tv1PB_Spec: TcxGridDBColumn; + Tv1PB_Width: TcxGridDBColumn; + Tv1PB_GramWeight: TcxGridDBColumn; + Tv1JYNo: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); diff --git a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local index 1f46e9a..a400e48 100644 --- a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local +++ b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local @@ -69,17 +69,17 @@ + 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.pas + 1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.dfm 1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas= - 1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.dfm - 1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas - 1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas= - 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.pas - 1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas= 1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas= - 1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.pas + 1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas= + 1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas= + 1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.pas + 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas= - 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas - 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.dfm - 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm + 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.dfm + 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas + 1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas diff --git a/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache b/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache index c525b3d..ec26228 100644 Binary files a/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache and b/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache differ diff --git a/项目代码/DJ/G01贸易生产计划/testDll.identcache b/项目代码/DJ/G01贸易生产计划/testDll.identcache index e93d68a..aa28d6a 100644 Binary files a/项目代码/DJ/G01贸易生产计划/testDll.identcache and b/项目代码/DJ/G01贸易生产计划/testDll.identcache differ diff --git a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local index 7d62280..ef420a1 100644 --- a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local +++ b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local @@ -59,8 +59,8 @@ 1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.dfm 1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas - 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas @@ -91,17 +91,17 @@ 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas + 1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas diff --git a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache index 0104787..b7f0e37 100644 Binary files a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache differ diff --git a/项目代码/DJ/G03贸易布匹检验/U_GetDllForm.pas b/项目代码/DJ/G03贸易布匹检验/U_GetDllForm.pas index 3831d3b..373b6ee 100644 --- a/项目代码/DJ/G03贸易布匹检验/U_GetDllForm.pas +++ b/项目代码/DJ/G03贸易布匹检验/U_GetDllForm.pas @@ -80,6 +80,8 @@ begin pswd := 'rightsoft@5740'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DParameters1:='Ȩ'; + dname := 'ADMIN'; + dcode := 'ADMIN'; end else begin diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm index c8a172b..801c803 100644 --- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm +++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm @@ -56,29 +56,30 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 13 + TabOrder = 14 OnClick = edtScanEnter Width = 164 end object Qty: TcxTextEdit Left = 89 - Top = 148 + Top = 86 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 9 + TabOrder = 7 OnClick = edtScanEnter Width = 105 end object FtyPCId: TcxTextEdit - Left = 89 - Top = 117 + Left = 9994 + Top = 10000 Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 8 + TabOrder = 74 + Visible = False OnClick = edtScanEnter - Width = 105 + Width = 144 end object Color: TcxTextEdit Left = 240 @@ -86,17 +87,18 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 12 + TabOrder = 13 Width = 164 end object ColorNo: TcxTextEdit - Left = 89 - Top = 86 + Left = 9994 + Top = 10000 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 7 - Width = 105 + TabOrder = 71 + Visible = False + Width = 144 end object CodeName: TcxTextEdit Left = 240 @@ -104,7 +106,7 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 11 + TabOrder = 12 Width = 164 end object OrderNo: TcxTextEdit @@ -117,19 +119,19 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 105 end object BCIOID: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 70 + TabOrder = 68 Visible = False Width = 144 end object InputLen: TcxTextEdit Tag = 999 Left = 89 - Top = 525 + Top = 614 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -142,7 +144,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 36 + TabOrder = 38 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 38 @@ -150,7 +152,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object BTPrint: TButton Left = 258 - Top = 572 + Top = 661 Width = 207 Height = 59 Caption = #25552' '#20132 @@ -160,7 +162,7 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 40 + TabOrder = 42 OnClick = BTPrintClick end object Button_bad: TButton @@ -196,7 +198,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Edit_pieceOrder: TcxTextEdit Tag = 999 Left = 269 - Top = 232 + Top = 321 AutoSize = False ParentFont = False Properties.ReadOnly = True @@ -208,7 +210,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 18 + TabOrder = 20 OnClick = Edit_pieceOrderClick Height = 31 Width = 20 @@ -216,7 +218,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Edit_fixLen: TcxTextEdit Tag = 999 Left = 342 - Top = 232 + Top = 321 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -228,7 +230,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 19 + TabOrder = 21 OnClick = edtScanEnter Height = 31 Width = 20 @@ -236,7 +238,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Tare: TcxTextEdit Tag = 999 Left = 157 - Top = 572 + Top = 661 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -248,7 +250,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 39 + TabOrder = 41 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 @@ -257,7 +259,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Coefficient: TcxTextEdit Tag = 999 Left = 89 - Top = 640 + Top = 729 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -269,7 +271,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 41 + TabOrder = 43 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 37 @@ -278,7 +280,7 @@ inherited frmMachRollMain: TfrmMachRollMain object InputWeight: TcxTextEdit Tag = 999 Left = 89 - Top = 572 + Top = 661 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -290,7 +292,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 38 + TabOrder = 40 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 @@ -298,12 +300,12 @@ inherited frmMachRollMain: TfrmMachRollMain end object BatchNO: TcxTextEdit Left = 89 - Top = 232 + Top = 321 AutoSize = False Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 16 + TabOrder = 18 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 31 @@ -311,12 +313,12 @@ inherited frmMachRollMain: TfrmMachRollMain end object PieceNo: TcxTextEdit Left = 182 - Top = 232 + Top = 321 AutoSize = False Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 17 + TabOrder = 19 Text = '1' OnClick = edtScanEnter OnKeyPress = InputLenKeyPress @@ -325,7 +327,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object OutPutWeight: TcxTextEdit Tag = 999 - Left = 9994 + Left = 9988 Top = 9751 AutoSize = False ParentFont = False @@ -337,7 +339,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 47 + TabOrder = 49 Visible = False OnClick = edtScanEnter OnKeyPress = InputLenKeyPress @@ -346,7 +348,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object edtPacketNo: TcxTextEdit Left = 408 - Top = 232 + Top = 321 AutoSize = False ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -357,7 +359,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 20 + TabOrder = 22 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 31 @@ -365,7 +367,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object AOrdDefNote1: TcxRichEdit Left = 0 - Top = 713 + Top = 802 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssBoth @@ -377,12 +379,12 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 45 + TabOrder = 47 Height = 238 Width = 181 end object cxDBImage1: TcxDBImage - Left = 9994 + Left = 9988 Top = 9751 Hint = 'FileName' DataBinding.DataField = 'FilesOther' @@ -393,14 +395,14 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ShowFocusRect = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 48 + TabOrder = 50 Visible = False Height = 122 Width = 280 end object grade: TcxComboBox Left = 303 - Top = 525 + Top = 614 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -415,7 +417,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 37 + TabOrder = 39 Text = #27491#21697 OnKeyPress = InputLenKeyPress Height = 38 @@ -454,7 +456,7 @@ inherited frmMachRollMain: TfrmMachRollMain object lblRuleConversion: TcxComboBox Tag = 2 Left = 142 - Top = 640 + Top = 729 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -476,7 +478,7 @@ inherited frmMachRollMain: TfrmMachRollMain StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 42 + TabOrder = 44 Text = #26080#38656#36716#25442 Height = 37 Width = 84 @@ -484,7 +486,7 @@ inherited frmMachRollMain: TfrmMachRollMain object packnote: TcxMemo Tag = 999 Left = 190 - Top = 713 + Top = 802 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssVertical @@ -496,7 +498,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 46 + TabOrder = 48 Height = 241 Width = 199 end @@ -529,17 +531,17 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 149 end object C_Pattern: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 49 + TabOrder = 51 Visible = False Width = 124 end object RuleYardstick: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 AutoSize = False ParentFont = False @@ -552,7 +554,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 50 + TabOrder = 52 Text = '100' Visible = False OnClick = edtScanEnter @@ -561,19 +563,19 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 69 end object C_StyleNo: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 ParentFont = False Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 51 + TabOrder = 53 Visible = False Width = 168 end object packPostBtn: TButton Left = 356 - Top = 640 + Top = 729 Width = 109 Height = 37 Caption = #25171#21253#25552#20132 @@ -583,31 +585,11 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 44 + TabOrder = 46 OnClick = packPostBtnClick end object customStrField1: TcxTextEdit - Left = 9994 - Top = 9751 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 52 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object customStrField2: TcxTextEdit - Left = 9994 - Top = 9751 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 53 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object C_Width: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 Style.HotTrack = False Style.TransparentBorder = False @@ -616,17 +598,8 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object C_GramWeight: TcxTextEdit - Left = 240 - Top = 148 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 14 - OnClick = edtScanEnter - Width = 164 - end - object addLen: TcxTextEdit - Left = 9994 + object customStrField2: TcxTextEdit + Left = 9988 Top = 9751 Style.HotTrack = False Style.TransparentBorder = False @@ -635,17 +608,46 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object addWet: TcxTextEdit + object C_Width: TcxTextEdit Left = 240 Top = 179 Style.HotTrack = False Style.TransparentBorder = False + TabOrder = 16 + OnClick = edtScanEnter + Width = 164 + end + object C_GramWeight: TcxTextEdit + Left = 240 + Top = 148 + Style.HotTrack = False + Style.TransparentBorder = False TabOrder = 15 OnClick = edtScanEnter Width = 164 end - object bt_printmd: TButton + object addLen: TcxTextEdit + Left = 9988 + Top = 9751 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 56 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object addWet: TcxTextEdit Left = 9994 + Top = 10000 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 75 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object bt_printmd: TButton + Left = 9988 Top = 9751 Width = 48 Height = 33 @@ -656,22 +658,12 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 56 + TabOrder = 57 Visible = False OnClick = bt_printmdClick end object presentLen: TcxTextEdit - Left = 9994 - Top = 9751 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 57 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object presentWeight: TcxTextEdit - Left = 9994 + Left = 9988 Top = 9751 Style.HotTrack = False Style.TransparentBorder = False @@ -680,37 +672,27 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object unitPieces: TcxTextEdit - Left = 328 - Top = 485 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 35 - OnClick = edtScanEnter - Width = 76 - end - object custName: TcxTextEdit - Left = 9994 + object presentWeight: TcxTextEdit + Left = 9988 Top = 9751 - Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 59 Visible = False - Width = 164 + OnClick = edtScanEnter + Width = 121 end - object customStrField3: TcxComboBox - Left = 10000 - Top = 10000 + object unitPieces: TcxTextEdit + Left = 328 + Top = 574 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 71 - Visible = False + TabOrder = 37 OnClick = edtScanEnter - Width = 145 + Width = 76 end - object c_ecolor: TcxTextEdit - Left = 9994 + object custName: TcxTextEdit + Left = 9988 Top = 9751 Properties.ReadOnly = True Style.HotTrack = False @@ -719,9 +701,29 @@ inherited frmMachRollMain: TfrmMachRollMain Visible = False Width = 164 end + object customStrField3: TcxComboBox + Left = 9994 + Top = 10000 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 69 + Visible = False + OnClick = edtScanEnter + Width = 145 + end + object c_ecolor: TcxTextEdit + Left = 9988 + Top = 9751 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 61 + Visible = False + Width = 164 + end object edit_roll_auto: TcxTextEdit Tag = 999 - Left = 9994 + Left = 9988 Top = 9751 AutoSize = False ParentFont = False @@ -734,14 +736,14 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 61 + TabOrder = 62 Visible = False OnClick = edit_roll_autoClick Height = 31 Width = 20 end object customStrField4: TcxButtonEdit - Left = 9994 + Left = 9988 Top = 9751 Hint = 'customStrField4/'#33258#23450#20041'4' Properties.Buttons = < @@ -751,16 +753,33 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False + TabOrder = 66 + Visible = False + OnClick = edtScanEnter + OnDblClick = customStrField5DblClick + Width = 121 + end + object customStrField8: TcxButtonEdit + Left = 9988 + Top = 9751 + Hint = 'customStrField8/'#33258#23450#20041'8' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Style.HotTrack = False + Style.TransparentBorder = False TabOrder = 65 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick Width = 121 end - object customStrField8: TcxButtonEdit - Left = 9994 + object customStrField7: TcxButtonEdit + Left = 9988 Top = 9751 - Hint = 'customStrField8/'#33258#23450#20041'8' + Hint = 'customStrField7/'#33258#23450#20041'7' Properties.Buttons = < item Default = True @@ -774,10 +793,10 @@ inherited frmMachRollMain: TfrmMachRollMain OnDblClick = customStrField5DblClick Width = 121 end - object customStrField7: TcxButtonEdit - Left = 9994 + object customStrField6: TcxButtonEdit + Left = 9988 Top = 9751 - Hint = 'customStrField7/'#33258#23450#20041'7' + Hint = 'customStrField6/'#33258#23450#20041'6' Properties.Buttons = < item Default = True @@ -791,25 +810,8 @@ inherited frmMachRollMain: TfrmMachRollMain OnDblClick = customStrField5DblClick Width = 121 end - object customStrField6: TcxButtonEdit - Left = 9994 - Top = 9751 - Hint = 'customStrField6/'#33258#23450#20041'6' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 62 - Visible = False - OnClick = edtScanEnter - OnDblClick = customStrField5DblClick - Width = 121 - end object customStrField5: TcxButtonEdit - Left = 9994 + Left = 9988 Top = 9751 Hint = 'customStrField5/'#33258#23450#20041'5' Properties.Buttons = < @@ -820,7 +822,7 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.OnButtonClick = customStrField5PropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 66 + TabOrder = 67 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick @@ -828,91 +830,91 @@ inherited frmMachRollMain: TfrmMachRollMain end object C_GramWeight1: TcxTextEdit Left = 239 - Top = 285 - AutoSize = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 23 - OnClick = edtScanEnter - Height = 31 - Width = 83 - end - object InputMeter: TcxTextEdit - Left = 89 - Top = 285 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 22 - OnClick = edtScanEnter - Width = 95 - end - object C_GramWeight2: TcxTextEdit - Left = 377 - Top = 285 - AutoSize = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 24 - OnClick = edtScanEnter - Height = 31 - Width = 88 - end - object C_GramWeight3: TcxTextEdit - Left = 89 - Top = 325 + Top = 374 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 25 OnClick = edtScanEnter Height = 31 - Width = 92 + Width = 83 end - object ValidC_Width: TcxTextEdit - Left = 257 - Top = 325 + object InputMeter: TcxTextEdit + Left = 89 + Top = 374 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 24 + OnClick = edtScanEnter + Width = 95 + end + object C_GramWeight2: TcxTextEdit + Left = 377 + Top = 374 + AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 26 OnClick = edtScanEnter - Width = 121 + Height = 31 + Width = 88 end - object BDBC_Width: TcxTextEdit + object C_GramWeight3: TcxTextEdit Left = 89 - Top = 365 + Top = 414 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 27 OnClick = edtScanEnter Height = 31 + Width = 92 + end + object ValidC_Width: TcxTextEdit + Left = 257 + Top = 414 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 28 + OnClick = edtScanEnter + Width = 121 + end + object BDBC_Width: TcxTextEdit + Left = 89 + Top = 454 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 29 + OnClick = edtScanEnter + Height = 31 Width = 121 end object JingMi: TcxTextEdit Left = 210 - Top = 485 + Top = 574 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 34 + TabOrder = 36 OnClick = edtScanEnter Height = 31 Width = 72 end object WeiMi: TcxTextEdit Left = 89 - Top = 485 + Top = 574 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 33 + TabOrder = 35 OnClick = edtScanEnter Height = 31 Width = 75 end object color_diff: TcxButtonEdit Left = 89 - Top = 405 + Top = 494 Hint = 'color_diff/'#39068#33394#24046#24322 Properties.Buttons = < item @@ -922,66 +924,15 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.OnButtonClick = hand_feelPropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 29 - OnClick = edtScanEnter - Width = 121 - end - object TW_diff: TcxButtonEdit - Left = 286 - Top = 405 - Hint = 'TW_diff/'#22836#23614#24046#24322 - AutoSize = False - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = hand_feelPropertiesButtonClick - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 30 - OnClick = edtScanEnter - Height = 31 - Width = 121 - end - object LMR_diff: TcxButtonEdit - Left = 89 - Top = 445 - Hint = 'LMR_diff/'#24038#20013#21491#24046#24322 - AutoSize = False - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = hand_feelPropertiesButtonClick - Style.HotTrack = False - Style.TransparentBorder = False TabOrder = 31 OnClick = edtScanEnter - Height = 31 Width = 121 end - object hand_feel: TcxButtonEdit + object TW_diff: TcxButtonEdit Left = 286 - Top = 365 - Hint = 'hand_feel/'#25163#24863 - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = hand_feelPropertiesButtonClick - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 28 - OnClick = edtScanEnter - Width = 121 - end - object color_light: TcxButtonEdit - Left = 286 - Top = 445 - Hint = 'color_light/'#33394#24425#20142#24230 + Top = 494 + Hint = 'TW_diff/'#22836#23614#24046#24322 + AutoSize = False Properties.Buttons = < item Default = True @@ -992,24 +943,75 @@ inherited frmMachRollMain: TfrmMachRollMain Style.TransparentBorder = False TabOrder = 32 OnClick = edtScanEnter + Height = 31 + Width = 121 + end + object LMR_diff: TcxButtonEdit + Left = 89 + Top = 534 + Hint = 'LMR_diff/'#24038#20013#21491#24046#24322 + AutoSize = False + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = hand_feelPropertiesButtonClick + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 33 + OnClick = edtScanEnter + Height = 31 + Width = 121 + end + object hand_feel: TcxButtonEdit + Left = 286 + Top = 454 + Hint = 'hand_feel/'#25163#24863 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = hand_feelPropertiesButtonClick + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 30 + OnClick = edtScanEnter + Width = 121 + end + object color_light: TcxButtonEdit + Left = 286 + Top = 534 + Hint = 'color_light/'#33394#24425#20142#24230 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = hand_feelPropertiesButtonClick + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 34 + OnClick = edtScanEnter Width = 121 end object LYFlag: TcxComboBox Left = 302 - Top = 640 + Top = 729 AutoSize = False Properties.Items.Strings = ( #26159 #21542) Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 43 + TabOrder = 45 Height = 37 Width = 45 end object btnClear: TcxButton Left = 452 - Top = 232 + Top = 321 Width = 83 Height = 30 Caption = #28165#31354 @@ -1017,16 +1019,57 @@ inherited frmMachRollMain: TfrmMachRollMain LookAndFeel.Kind = lfUltraFlat LookAndFeel.NativeStyle = False LookAndFeel.SkinName = '' - TabOrder = 21 + TabOrder = 23 OnClick = btnClearClick end object BatchNoQty: TcxTextEdit + Left = 89 + Top = 117 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 8 + OnClick = edtScanEnter + Width = 105 + end + object PB_Code: TcxTextEdit + Left = 89 + Top = 148 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 9 + OnClick = edtScanEnter + Width = 105 + end + object PB_Spec: TcxTextEdit Left = 89 Top = 179 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 10 + OnClick = edtScanEnter + Width = 105 + end + object CINote: TcxMemo + Left = 240 + Top = 210 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 17 + OnClick = edtScanEnter + Height = 89 + Width = 164 + end + object JYNote: TcxMemo + Left = 89 + Top = 209 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 11 + OnClick = edtScanEnter + Height = 89 Width = 105 end object dxLayoutControl_packGroup_Root: TdxLayoutGroup @@ -1058,7 +1101,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.Width = 697 AllowRemove = False Hidden = True - ItemIndex = 6 + ItemIndex = 5 LayoutDirection = ldHorizontal Padding.Bottom = -10 Padding.Top = -10 @@ -1112,6 +1155,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.Height = 175 SizeOptions.Width = 721 AllowRemove = False + ItemIndex = 1 LayoutDirection = ldHorizontal Padding.Bottom = -10 Padding.Left = -10 @@ -1120,22 +1164,20 @@ inherited frmMachRollMain: TfrmMachRollMain Index = 2 end object dxLayoutItem4: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 CaptionOptions.Text = #26579#21378#32568#21495 Control = FtyPCId ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False - Index = 2 + Index = -1 end object dxLayoutItem5: TdxLayoutItem - Parent = dxLayoutGroup_plan_1 CaptionOptions.Text = #33394#21495 Control = ColorNo ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False - Index = 1 + Index = -1 end object dxLayoutItem6: TdxLayoutItem Parent = dxLayoutGroup_plan_1 @@ -1145,7 +1187,7 @@ inherited frmMachRollMain: TfrmMachRollMain ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False - Index = 3 + Index = 1 end object dxLayoutGroup_plan_1: TdxLayoutGroup Parent = dxLayoutGroup_plan @@ -1157,7 +1199,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.SizableVert = True SizeOptions.Width = 188 Hidden = True - ItemIndex = 4 + ItemIndex = 5 ShowBorder = False UseIndent = False Index = 0 @@ -1696,12 +1738,13 @@ inherited frmMachRollMain: TfrmMachRollMain Index = -1 end object dxLayoutItem_width: TdxLayoutItem + Parent = dxLayoutGroup_plan_2 CaptionOptions.Text = #38376#24133 Control = C_Width ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False - Index = -1 + Index = 4 end object dxLayoutItem_gram: TdxLayoutItem Parent = dxLayoutGroup_plan_2 @@ -1721,13 +1764,12 @@ inherited frmMachRollMain: TfrmMachRollMain Index = -1 end object dxLayoutItem_addwet: TdxLayoutItem - Parent = dxLayoutGroup_plan_2 CaptionOptions.Text = #21152#37325 Control = addWet ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False - Index = 4 + Index = -1 end object dxLayoutItem_btprintmd: TdxLayoutItem CaptionOptions.Text = #25171#21360#30721#21333 @@ -2038,8 +2080,45 @@ inherited frmMachRollMain: TfrmMachRollMain ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 105 ControlOptions.ShowBorder = False + Index = 2 + end + object dxLayoutItem_PB_Code: TdxLayoutItem + Parent = dxLayoutGroup_plan_1 + CaptionOptions.Text = #22383#24067#32534#21495 + Control = PB_Code + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 105 + ControlOptions.ShowBorder = False + Index = 3 + end + object dxLayoutItem_PB_Spec: TdxLayoutItem + Parent = dxLayoutGroup_plan_1 + SizeOptions.Height = 30 + CaptionOptions.Text = #22383#24067#35268#26684 + Control = PB_Spec + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 105 + ControlOptions.ShowBorder = False Index = 4 end + object dxLayoutItem_note: TdxLayoutItem + Parent = dxLayoutGroup_plan_2 + CaptionOptions.Text = #22791#27880 + Control = CINote + ControlOptions.OriginalHeight = 89 + ControlOptions.OriginalWidth = 185 + ControlOptions.ShowBorder = False + Index = 5 + end + object dxLayoutItem_JYNote: TdxLayoutItem + Parent = dxLayoutGroup_plan_1 + CaptionOptions.Text = #26816#39564#35201#27714 + Control = JYNote + ControlOptions.OriginalHeight = 89 + ControlOptions.OriginalWidth = 164 + ControlOptions.ShowBorder = False + Index = 5 + end end object Panel_right: TPanel [1] Left = 860 diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas index 8e116ca..8110894 100644 --- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas +++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas @@ -300,6 +300,14 @@ type dxLayoutItem_btnClear: TdxLayoutItem; BatchNoQty: TcxTextEdit; dxLayoutItem_BatchNoQty: TdxLayoutItem; + PB_Code: TcxTextEdit; + PB_Spec: TcxTextEdit; + dxLayoutItem_PB_Code: TdxLayoutItem; + dxLayoutItem_PB_Spec: TdxLayoutItem; + CINote: TcxMemo; + dxLayoutItem_note: TdxLayoutItem; + JYNote: TcxMemo; + dxLayoutItem_JYNote: TdxLayoutItem; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure Button_badClick(Sender: TObject); @@ -353,7 +361,7 @@ type private FCIID, FOperationStatus, FCIFName, FWorkshop: string; FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string; - FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight: string; + FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight, FPB_Code, FPB_Spec: string; FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string; Faddwet, faddlen, FPackbag: double; FFtyPCId, FGangNo, FRulePieceNo, FRulePackNo, FCDUnit: string; @@ -776,11 +784,11 @@ begin C_GramWeight3.text := ''; ValidC_Width.text := ''; BDBC_Width.text := ''; - hand_feel.text := ''; - color_diff.text := ''; - TW_diff.text := ''; - LMR_diff.text := ''; - color_light.text := ''; +// hand_feel.text := ''; +// color_diff.text := ''; +// TW_diff.text := ''; +// LMR_diff.text := ''; +// color_light.text := ''; JingMi.text := ''; WeiMi.text := ''; LYFlag.text := ''; @@ -1273,6 +1281,8 @@ begin InputWeight.Text := ''; FLenUnit := ''; BatchNO.Text := ''; + FPB_Code := ''; + FPB_Spec := ''; Faddwet := 0; faddlen := 0; FPackbag := 0; @@ -1388,11 +1398,11 @@ begin FC_EName := trim(fieldbyName('C_EName').AsString); FBatchNO := Trim(fieldbyname('BatchNO').AsString); FC_Spec := trim(fieldbyName('C_Spec').AsString); - FC_Color := trim(fieldbyName('C_Color').AsString); + FC_Color := trim(fieldbyName('C_CustColorNo').AsString); FC_ColorNo := trim(fieldbyName('C_ColorNo').AsString); FC_EColor := trim(fieldbyName('C_EColor').AsString); - FC_Width := trim(fieldbyName('C_Width').AsString); - FC_GramWeight := trim(fieldbyName('C_GramWeight').AsString); + FC_Width := trim(fieldbyName('PB_Width').AsString); + FC_GramWeight := trim(fieldbyName('PB_GramWeight').AsString); C_width.Text := FC_Width; C_GramWeight.Text := FC_GramWeight; FC_Pattern := trim(fieldbyName('C_Pattern').AsString); @@ -1400,6 +1410,8 @@ begin FFtyPCId := trim(fieldbyName('FtyPCId').AsString); FRulePieceNo := trim(fieldbyName('RulePieceNo').AsString); FRulePackNo := trim(fieldbyName('RulePackNo').AsString); + FPB_Code := trim(fieldbyName('PB_Code').AsString); + FPB_Spec := trim(fieldbyName('PB_Spec').AsString); if FRulePieceNo = '' then FRulePieceNo := '׺'; @@ -1489,8 +1501,10 @@ begin c_eColor.Text := FC_EColor; FtyPCId.Text := FFtyPCId; BCIOID.Text := FBCIOID; + PB_Code.Text := FPB_Code; + PB_Spec.Text := FPB_Spec; Piece.Text := trim(fieldbyName('ordPiece').AsString); - BatchNoQty.text := trim(fieldbyName('BatchNoQty').AsString); + BatchNoQty.text := trim(fieldbyName('ShippingSample').AsString); Qty.Text := trim(fieldbyName('ordQty').AsString) + trim(fieldbyName('ordUnit').AsString); // Ƥ Tare.Text := trim(fieldbyName('RuleLaterTare').AsString); @@ -1509,6 +1523,13 @@ begin packnote.Lines.Add(trim(fieldbyName('packnote').AsString)); packnote.Lines.Add('ע'); packnote.Lines.Add(trim(fieldbyName('ordnote').AsString)); + + JYNote.Lines.Clear; + JYNote.Lines.Add(trim(fieldbyName('PackNote').AsString)); + CINote.Lines.Clear; + CINote.Lines.Add(trim(fieldbyName('OrdNote').AsString)); + + // dxLayoutItem_pieceorder if fieldbyName('FixedLength').AsInteger > 0 then begin @@ -2817,6 +2838,11 @@ begin fieldbyName('JingMi').value := trim(JingMi.Text); fieldbyName('WeiMi').value := trim(WeiMi.Text); fieldbyName('LYFlag').value := trim(LYFlag.Text); + fieldbyName('BatchNoQty').value := trim(BatchNoQty.Text); + fieldbyName('PB_Code').value := FPB_Code; + fieldbyName('PB_Spec').value := FPB_Spec; + fieldbyName('JYNote').value := trim(JYNote.Text); + fieldbyName('CINote').value := trim(CINote.Text); /// ¼ӵһ /// //ƴƥ