diff --git a/public10/ThreeFun/Form/U_ZDYHelp.dfm b/public10/ThreeFun/Form/U_ZDYHelp.dfm index 3f76935..826f7be 100644 --- a/public10/ThreeFun/Form/U_ZDYHelp.dfm +++ b/public10/ThreeFun/Form/U_ZDYHelp.dfm @@ -96,8 +96,11 @@ inherited frmZDYHelp: TfrmZDYHelp Caption = #22791#27880'1' DataBinding.FieldName = 'note1' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = V1Column1PropertiesEditValueChanged + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + #22383#24067#30133#28857 + #26579#33394#30133#28857) + Properties.OnEditValueChanged = V1note1PropertiesEditValueChanged HeaderAlignmentHorz = taCenter MinWidth = 100 Width = 100 @@ -241,7 +244,7 @@ inherited frmZDYHelp: TfrmZDYHelp LockType = ltReadOnly Parameters = <> Left = 32 - Top = 176 + Top = 177 end object ADOQueryTemp: TADOQuery [7] Connection = ADOConnection1 diff --git a/public10/ThreeFun/Form/U_ZDYHelp.pas b/public10/ThreeFun/Form/U_ZDYHelp.pas index 936ac29..e3feb32 100644 --- a/public10/ThreeFun/Form/U_ZDYHelp.pas +++ b/public10/ThreeFun/Form/U_ZDYHelp.pas @@ -11,7 +11,8 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, - dxScrollbarAnnotations, cxContainer, cxImageList, cxLookAndFeelPainters; + dxScrollbarAnnotations, cxContainer, cxImageList, cxLookAndFeelPainters, + cxDropDownEdit; type TfrmZDYHelp = class(TfrmBaseInput) @@ -62,6 +63,7 @@ type procedure V1Column1PropertiesEditValueChanged(Sender: TObject); procedure V1HelpTypePropertiesEditValueChanged(Sender: TObject); procedure FormDestroy(Sender: TObject); + procedure V1note1PropertiesEditValueChanged(Sender: TObject); private procedure InitGrid(); { Private declarations } @@ -341,7 +343,7 @@ begin V1Note.Visible := fnote; V1ZdyFlag.Visible := fZdyFlag; V1OrderNo.Visible := forderno; - v1note1.Visible := fnote1; +// V1note1.Visible := fnote1; V1HelpType.Visible := fhelpType; if ViewFlag = True then begin @@ -537,6 +539,37 @@ begin end; end; +procedure TfrmZDYHelp.V1note1PropertiesEditValueChanged(Sender: TObject); +var + mvalue: string; +begin + inherited; + if Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) = '' then + begin + Application.MessageBox('名称不能为空!', '提示', 0); + Exit; + end; + mvalue := TcxTextEdit(Sender).EditingText; + if Trim(mvalue) = '' then + begin + mvalue := ''; + end; + with ClientDataSet1 do + begin + Edit; + FieldByName('Note1').Value := mvalue; + Post; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('Update KH_Zdy Set Note1=''' + Trim(mvalue) + ''''); + sql.Add(' where ZdyNo=''' + Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) + ''''); + ExecSQL; + end; +end; + procedure TfrmZDYHelp.V1OrderNoPropertiesEditValueChanged(Sender: TObject); var mvalue: string; diff --git a/public10/ThreeFun/Form/U_ZDYHelp.vlb b/public10/ThreeFun/Form/U_ZDYHelp.vlb deleted file mode 100644 index eb98df9..0000000 --- a/public10/ThreeFun/Form/U_ZDYHelp.vlb +++ /dev/null @@ -1,96 +0,0 @@ -锘縖TBDel] -Coordinates=374,214,50,36 - -[Label2] -Coordinates=298,146,53,58 - -[ToolButton1] -Coordinates=280,214,84,36 - -[cxGrid1Level1] -Coordinates=361,155,97,36 - -[V1HelpType] -Coordinates=361,210,85,36 - -[TBEdit] -Coordinates=217,214,53,36 - -[V1Note] -Coordinates=342,251,57,36 - -[ADOQueryCmd] -Coordinates=121,146,104,58 - -[TBAdd] -Coordinates=153,214,54,36 - -[V1OrderNo] -Coordinates=194,251,79,36 - -[V1note1] -Coordinates=125,251,62,36 - -[TV1] -Coordinates=76,251,40,36 - -[TBClose] -Coordinates=79,214,64,36 - -[Panel1] -Coordinates=333,78,55,58 - -[cxGrid1] -Coordinates=10,214,59,36 - -[V1Name] -Coordinates=504,133,64,36 - -[ADOQueryTemp] -Coordinates=233,10,109,58 - -[cxGridPopupMenu1] -Coordinates=504,188,128,36 - -[ADOConnection1] -Coordinates=504,243,114,36 - -[ThreeImgList] -Coordinates=504,298,90,36 - -[V1Code] -Coordinates=435,325,61,36 - -[ClientDataSet1] -Coordinates=10,146,101,58 - -[V1ZdyFlag] -Coordinates=356,325,77,36 - -[DataSource1] -Coordinates=219,78,89,36 - -[Label1] -Coordinates=235,146,53,58 - -[TBSave] -Coordinates=438,146,60,36 - -[ADOQueryMain] -Coordinates=398,78,105,58 - -[DataLink_TradeManage.AdoDataLink] -Coordinates=10,78,229,58 - -[ToolBar1] -Coordinates=361,146,67,36 - -[frmBaseInput.ADOQueryBaseTemp] -Coordinates=352,10,219,58 - -[frmBaseInput.ADOQueryBaseCmd] -Coordinates=10,10,213,58 - -[] -Coordinates=249,78,74,58 - diff --git a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/ProjectGroup1.groupproj.local b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/ProjectGroup1.groupproj.local index 5773184..df854d1 100644 --- a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/ProjectGroup1.groupproj.local +++ b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/ProjectGroup1.groupproj.local @@ -1,6 +1,6 @@ 锘 - + diff --git a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.dfm b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.dfm index 0b92d65..a06b0e8 100644 --- a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.dfm +++ b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.dfm @@ -8,6 +8,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Position = poScreenCenter WindowState = wsMaximized OnClose = FormClose + ExplicitTop = -63 ExplicitWidth = 1093 ExplicitHeight = 689 PixelsPerInch = 96 @@ -234,7 +235,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object DLYDate: TcxDateEdit Tag = 2 Left = 67 - Top = 44 + Top = 49 Properties.SaveTime = False Properties.ShowTime = False Style.HotTrack = False @@ -245,7 +246,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object saleser: TcxButtonEdit Tag = 2 Left = 247 - Top = 44 + Top = 49 Hint = 'saleser/'#19994#21153#21592 Properties.Buttons = < item @@ -262,7 +263,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object factoryName: TcxButtonEdit Tag = 2 Left = 446 - Top = 44 + Top = 49 Hint = 'FtyName/'#21152#24037#21378 Properties.Buttons = < item @@ -279,7 +280,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object Gilding: TcxButtonEdit Tag = 2 Left = 67 - Top = 74 + Top = 85 Hint = 'Gilding/'#28907#37329 Properties.Buttons = < item @@ -296,7 +297,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object PackSeal: TcxButtonEdit Tag = 2 Left = 657 - Top = 74 + Top = 85 Hint = 'PackSeal/'#23553#26465 Properties.Buttons = < item @@ -317,7 +318,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object ShippingSample: TcxButtonEdit Tag = 2 Left = 247 - Top = 74 + Top = 85 Hint = 'ShippingSample/'#33337#26679 AutoSize = False Properties.Buttons = < @@ -330,13 +331,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Style.HotTrack = False Style.TransparentBorder = False TabOrder = 8 - Height = 25 + Height = 29 Width = 150 end object SizeNote: TcxButtonEdit Tag = 2 Left = 446 - Top = 74 + Top = 85 Hint = 'SizeNote/'#24320#21098 Properties.Buttons = < item @@ -353,7 +354,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object OrdNote: TcxMemo Tag = 2 Left = 67 - Top = 220 + Top = 241 Properties.ScrollBars = ssVertical Style.HotTrack = False Style.TransparentBorder = False @@ -364,7 +365,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object PackNote: TcxMemo Tag = 2 Left = 67 - Top = 136 + Top = 157 Properties.ScrollBars = ssVertical Style.HotTrack = False Style.TransparentBorder = False @@ -466,7 +467,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut end object LabVolume: TcxButtonEdit Left = 67 - Top = 106 + Top = 121 Properties.Buttons = < item Default = True @@ -482,7 +483,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut end object LabPackage: TcxButtonEdit Left = 299 - Top = 106 + Top = 121 Properties.Buttons = < item Default = True @@ -594,7 +595,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut AllowRemove = False CaptionOptions.Text = '[COLOR=#FF0000]*[/COLOR]'#35746#21333#21495 Control = OrderNo - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = 0 @@ -606,7 +607,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut AllowRemove = False CaptionOptions.Text = #23458' '#25143 Control = CustName - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = 1 @@ -617,7 +618,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableHorz = True CaptionOptions.Text = #21512#21516#21495 Control = ConNo - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = 2 @@ -629,7 +630,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut AllowRemove = False CaptionOptions.Text = #25490#21333#26085#26399 Control = OrdDate - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = 3 @@ -648,7 +649,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableHorz = True CaptionOptions.Text = #21152#24037#21378 Control = factoryName - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = 2 @@ -660,7 +661,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut AllowRemove = False CaptionOptions.Text = #20132#36135#26085#26399 Control = DLYDate - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = 0 @@ -672,7 +673,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut AllowRemove = False CaptionOptions.Text = #19994#21153#21592 Control = saleser - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = 1 @@ -705,7 +706,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableHorz = True CaptionOptions.Text = #28907' '#37329 Control = Gilding - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = 0 @@ -716,7 +717,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableHorz = True CaptionOptions.Text = #24320' '#21098 Control = SizeNote - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = 2 @@ -727,7 +728,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableHorz = True CaptionOptions.Text = #23553' '#26465 Control = PackSeal - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = 3 @@ -770,7 +771,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = False CaptionOptions.Text = #33136#23553#22791#27880 Control = PackSealNote - ControlOptions.OriginalHeight = 19 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = -1 @@ -781,7 +782,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = False CaptionOptions.Text = #21253#35013#26041#24335 Control = PackType - ControlOptions.OriginalHeight = 19 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = -1 @@ -792,7 +793,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = False CaptionOptions.Text = #25968#37327#35201#27714#65292#28322#30701#35013 Control = QtyNote - ControlOptions.OriginalHeight = 19 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = -1 @@ -803,7 +804,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = False CaptionOptions.Text = #20854#20182#35201#27714 Control = OtherProcess1 - ControlOptions.OriginalHeight = 19 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 131 ControlOptions.ShowBorder = False Index = -1 @@ -824,7 +825,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.Width = 237 CaptionOptions.Text = #21367#26631#31614 Control = LabVolume - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 183 ControlOptions.ShowBorder = False Index = 0 @@ -836,7 +837,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.Width = 204 CaptionOptions.Text = #21253#26631#31614 Control = LabPackage - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 162 ControlOptions.ShowBorder = False Index = 1 @@ -847,7 +848,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = True CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'1' Control = CustDefStr1 - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = -1 @@ -858,7 +859,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = True CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'2' Control = CustDefStr2 - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = -1 @@ -869,7 +870,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = True CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'3' Control = CustDefStr3 - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 150 ControlOptions.ShowBorder = False Index = -1 @@ -880,7 +881,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = True CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'1' Control = CustDefFloat1 - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 94 ControlOptions.ShowBorder = False Index = -1 @@ -891,7 +892,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut SizeOptions.SizableVert = True CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'2' Control = CustDefFloat2 - ControlOptions.OriginalHeight = 23 + ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 82 ControlOptions.ShowBorder = False Index = -1 @@ -987,17 +988,18 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut TabOrder = 1 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> - ClientRectBottom = 337 - ClientRectRight = 200 - ClientRectTop = 28 + ClientRectBottom = 335 + ClientRectLeft = 2 + ClientRectRight = 198 + ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = #21367#26631#31614 ImageIndex = 0 object RMPreview1: TRMPreview Left = 0 Top = 0 - Width = 200 - Height = 309 + Width = 196 + Height = 303 Align = alClient BevelOuter = bvNone Caption = 'Insert After' @@ -1020,11 +1022,15 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut object cxTabSheet2: TcxTabSheet Caption = #21253#26631#31614 ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 28 + ExplicitWidth = 200 + ExplicitHeight = 309 object RMPreview2: TRMPreview Left = 0 Top = 0 - Width = 200 - Height = 309 + Width = 196 + Height = 303 Align = alClient BevelOuter = bvNone Caption = #26631#31614#39044#35272 @@ -1036,6 +1042,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Options.DrawBorder = False Options.BorderPen.Color = clGray Options.BorderPen.Style = psDash + ExplicitWidth = 200 + ExplicitHeight = 309 end end end @@ -1047,6 +1055,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Height = 250 Align = alBottom TabOrder = 3 + ExplicitLeft = 1 + ExplicitTop = 399 object Tv1: TcxGridDBTableView PopupMenu = PM_1 Navigator.Buttons.CustomButtons = <> @@ -1180,6 +1190,34 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut HeaderAlignmentHorz = taCenter Width = 115 end + object Tv1JWQL: TcxGridDBColumn + Caption = #32463#32428#24378#21147 + DataBinding.FieldName = 'JWQL' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1PB_Spec: TcxGridDBColumn + Caption = ' '#22383#24067#35268#26684 + DataBinding.FieldName = 'PB_Spec' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1PB_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'PB_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1DSLight: TcxGridDBColumn + Caption = #23545#33394#20809#28304 + DataBinding.FieldName = 'DSLight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end object v1C_Pattern: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' diff --git a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.pas b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.pas index 5a2d059..2fd1286 100644 --- a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.pas +++ b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanInPut.pas @@ -155,6 +155,10 @@ type ToolButton7: TToolButton; ToolButton8: TToolButton; Tv1Column1: TcxGridDBColumn; + Tv1JWQL: TcxGridDBColumn; + Tv1PB_Spec: TcxGridDBColumn; + Tv1PB_Code: TcxGridDBColumn; + Tv1DSLight: TcxGridDBColumn; 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 0f9bad6..8cd0da2 100644 --- a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanMgeList.dfm +++ b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/U_TradePlanMgeList.dfm @@ -187,7 +187,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object custName: TcxTextEdit Tag = 2 Left = 629 - Top = 7 + Top = 11 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -197,7 +197,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object ConNo: TcxTextEdit Tag = 2 Left = 803 - Top = 7 + Top = 11 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -221,7 +221,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object OrderNo: TcxTextEdit Tag = 2 Left = 439 - Top = 7 + Top = 11 Properties.OnChange = OrderNoPropertiesChange Style.HotTrack = False Style.TransparentBorder = False @@ -258,7 +258,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object endDate: TcxDateEdit Left = 242 - Top = 7 + Top = 11 Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False @@ -267,7 +267,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object begdate: TcxDateEdit Left = 88 - Top = 7 + Top = 11 Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False @@ -277,7 +277,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object batchNo: TcxTextEdit Tag = 2 Left = 989 - Top = 7 + Top = 11 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -315,7 +315,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AllowRemove = False CaptionOptions.Text = #35746#21333#21495 Control = OrderNo - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 109 ControlOptions.ShowBorder = False Index = 2 @@ -325,7 +325,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AllowRemove = False CaptionOptions.Text = #23458#25143#21517#31216 Control = custName - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 109 ControlOptions.ShowBorder = False Index = 3 @@ -334,7 +334,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Tag = 99 CaptionOptions.Text = #19994#21153#21592 Control = ywy - ControlOptions.OriginalHeight = 21 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -344,7 +344,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Visible = False CaptionOptions.Text = #20135#21697#21517#31216 Control = C_Name - ControlOptions.OriginalHeight = 21 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -354,7 +354,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList SizeOptions.Width = 195 CaptionOptions.Text = #21046#21333#26085#26399 Control = begdate - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 123 ControlOptions.ShowBorder = False Index = 0 @@ -364,7 +364,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList SizeOptions.Width = 154 CaptionOptions.Text = '--' Control = endDate - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 132 ControlOptions.ShowBorder = False Index = 1 @@ -373,7 +373,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Parent = dxLayoutControl_queryGroup_Root CaptionOptions.Text = #21512#21516#21495 Control = ConNo - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 105 ControlOptions.ShowBorder = False Index = 4 @@ -383,7 +383,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Visible = False CaptionOptions.Text = #23458#25143#21333#21495 Control = BuyConNo - ControlOptions.OriginalHeight = 21 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -392,7 +392,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Parent = dxLayoutControl_queryGroup_Root CaptionOptions.Text = #26412#21378#32568#21495 Control = batchNo - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 105 ControlOptions.ShowBorder = False Index = 5 @@ -400,7 +400,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object dxLayoutItem_FtyPCId: TdxLayoutItem CaptionOptions.Text = #26579#21378#32568#21495 Control = FtyPCId - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 105 ControlOptions.ShowBorder = False Index = -1 @@ -416,9 +416,10 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Properties.CustomButtons.Buttons = <> Properties.TabPosition = tpBottom OnClick = cxPageControl1Click - ClientRectBottom = 433 - ClientRectRight = 1113 - ClientRectTop = 0 + ClientRectBottom = 429 + ClientRectLeft = 2 + ClientRectRight = 1111 + ClientRectTop = 2 object cxTabSheet1: TcxTabSheet Caption = #27719#24635#35270#22270 ImageIndex = 0 @@ -806,13 +807,12 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object cxGrid2: TcxGrid Left = 0 - Top = 278 - Width = 1113 + Top = 272 + Width = 1109 Height = 155 Align = alBottom TabOrder = 1 LookAndFeel.ScrollbarMode = sbmDefault - ExplicitTop = 284 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1303,18 +1303,21 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object cxSplitter1: TcxSplitter Left = 0 - Top = 270 - Width = 1113 + Top = 264 + Width = 1109 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom Control = cxGrid2 - ExplicitTop = 264 end end object cxTabSheet2: TcxTabSheet Caption = #26126#32454#35270#22270 ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object cxGrid3: TcxGrid Left = -549 Top = 46 diff --git a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.dproj.local b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.dproj.local index 2666899..fb76dd9 100644 --- a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.dproj.local +++ b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.dproj.local @@ -1,34 +1,6 @@ 锘 - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -53,7 +25,7 @@ - + @@ -99,10 +71,10 @@ 1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_SysLogOrderzsd.pas= 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.578,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_MJSJFX.pas= - 1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_OrderInPut.pas= - 1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_TradePlanList.pas= 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_ProductOrderNewList.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.296,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\U_TradePlanList.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.651,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G01璐告槗鐢熶骇璁″垝\Unit2.pas diff --git a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.identcache b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/djdPackPlan.identcache index 3b1cdb8..b8fbbe4 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 c058f45..e93d68a 100644 Binary files a/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/testDll.identcache and b/椤圭洰浠ｇ爜/DJ/G01璐告槗鐢熶骇璁″垝/testDll.identcache differ diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dpr b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dpr index 8fe4fbd..77a3c67 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dpr +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dpr @@ -18,7 +18,7 @@ uses U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas', U_CompressionFun in '..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas', U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas', - U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp}, + U_CDList in 'U_CDList.pas' {frmCDList}, U_AttachmentUpload in '..\A00通用窗体\U_AttachmentUpload.pas' {frmFjList_RZ}, U_ClothInfoSel in '..\A00通用窗体\U_ClothInfoSel.pas' {frmClothInfoSel}, U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel}, @@ -50,7 +50,8 @@ uses U_FormInitThread in '..\..\..\public10\design\U_FormInitThread.pas', Unit2 in 'Unit2.pas' {Form2}, U_ControlData in '..\..\..\public10\ThreeFun\Fun\U_ControlData.pas', - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp}; {$R *.res} diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj index de0f18d..ed2a45f 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj @@ -4,7 +4,7 @@ DjdMachineInsp.dpr True Debug - 38017 + 1 Library VCL 19.2 @@ -13,16 +13,6 @@ true - - true - Base - true - - - true - Base - true - true Base @@ -38,24 +28,6 @@ Base true - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - true Cfg_1 @@ -67,24 +39,6 @@ Base true - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - true Cfg_2 @@ -108,13 +62,6 @@ 2052 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - - - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png - System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -132,15 +79,6 @@ false 0 - - Debug - - - Debug - - - Debug - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿testDll.exe @@ -150,18 +88,9 @@ false true - - Debug - - - Debug - - - Debug - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10RepoV1\椤圭洰浠ｇ爜\MoBan\椤圭洰浠ｇ爜\DJ\G03璐告槗甯冨尮妫楠孿testDll.exe + D:\rtgit\git_clone\D10DJjinglei\椤圭洰浠ｇ爜\DJ\G03璐告槗甯冨尮妫楠孿testDll.exe @@ -190,8 +119,8 @@ - -
frmZDYHelp
+ +
frmCDList
dfm @@ -306,6 +235,10 @@ + +
frmZDYHelp
+ dfm + Cfg_2 Base @@ -328,10 +261,6 @@ - True - True - True - True True False diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj.local b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj.local index caddfb3..c1eb23e 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj.local +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.dproj.local @@ -1,31 +1,31 @@ 锘 + 1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas + 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas 1899-12-30 00:00:00.000.616,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_LablePrint.pas 1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_TradePack.pas - 1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿Unit1.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_baseList1.dfm 1899-12-30 00:00:00.000.582,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.616,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.dfm=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_LablePrint.dfm - 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.870,=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_ProcessSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_ClothInfoSel.pas=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas + 1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\椤圭洰浠ｇ爜\DJ\G03璐告槗甯冨尮妫楠孿U_CDList.pas=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿Unit2.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.965,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿DyeInsp.dproj=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿InformationBase.dproj 1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿TradeInsp.dproj=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿TradeMachineInsp.dproj 1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿Unit1.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_ClothInfoSel.pas=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿Unit1.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_baseList1.pas 1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeMachInsp.pas= - 1899-12-30 00:00:00.000.965,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿DyeInsp.dproj=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿InformationBase.dproj + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.532,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿U_DyeMachInsp.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿Unit1.pas 1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas 1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_frameBads.pas 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_KeyBoard.pas @@ -36,99 +36,74 @@ 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_frameParam.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_MachRollMain.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas - 1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.983,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿Unit1.pas= + 1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ProductListHelp.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\椤圭洰浠ｇ爜\鐫跨壒\鏂癉LL鍒濆鍖(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G00璐告槗閫氱敤绐椾綋\U_TradePlanSel.pas= 1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_BillPrintList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.581,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿TradeInsp.dproj=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿DyeInsp.dproj 1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_TradeClothWaitPack.pas 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas - 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DeviceJkTest.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DeviceJkTest.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm - 1899-12-30 00:00:00.000.581,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿TradeInsp.dproj=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿DyeInsp.dproj - 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_MdPrint.dfm + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ParamSet.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_frameParam.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.dfm - 1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DeviceJkDll.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas - 1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList_Auto.dfm - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\椤圭洰浠ｇ爜\鐫跨壒\鏂癉LL鍒濆鍖(CSH.dll)\U_ModuleNote.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.757,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ProductJYHZList.pas 1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\A00閫氱敤缁勪欢\FrameDateSel.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\椤圭洰浠ｇ爜\鐫跨壒\鏂癉LL鍒濆鍖(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_MdPrint.dfm + 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ProductJYHZList.pas + 1899-12-30 00:00:00.000.706,=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.487,D:\Dp10Repo\椤圭洰浠ｇ爜\鐫跨壒\鏂癉LL鍒濆鍖(CSH.dll)\U_ZDYHelpSel.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.975,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DeviceJkDll.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_KeyBoard.dfm 1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_frameBads.dfm 1899-12-30 00:00:00.000.909,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\F05鏌撹壊妫楠孿U_DyeClothInspList.pas 1899-12-30 00:00:00.000.201,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelMapSet.pas 1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿TradeMachineInsp.dproj=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿DjdMachineInsp.dproj 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.pas - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.pas + 1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList_Auto.dfm 1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\D10djdPack\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList_Auto.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_MdPrint.pas - 1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.pas - 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas - 1899-12-30 00:00:00.000.322,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿U_TradeMachInsp.pas + 1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\A00閫氱敤绐椾綋\U_LabelPrint.pas 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_SysLogList.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ProductListHelp.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm - 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_BatchMdyData.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas - 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_MachRollMain.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm + 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ParamSet.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_SysLogList.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm - 1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas + 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_MachRollMain.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm + 1899-12-30 00:00:00.000.322,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\G03璐告槗甯冨尮妫楠孿U_TradeMachInsp.pas 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_BatchMdyData.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤妯℃澘\Unit1.pas - 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ParamSet.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm + 1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\椤圭洰浠ｇ爜\DJ\G03璐告槗甯冨尮妫楠孿U_CDList.dfm=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.dfm 1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\椤圭洰浠ｇ爜\djdPack\G03璐告槗甯冨尮妫楠孿U_baseList1.pas= 1899-12-30 00:00:00.000.692,D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_ClothInfoSel.dfm=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_CompanySel.dfm - 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DjdDjClList.pas + 1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit1.pas + 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_BatchMdyData.pas=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.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.950,=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.747,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList.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.964,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.pas=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DjdDjClList.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_DjdDjClList.dfm 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿Unit2.dfm=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_ProductJYHZList.dfm 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G00璐告槗閫氱敤绐椾綋\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\椤圭洰浠ｇ爜\RTBasics\A00閫氱敤绐椾綋\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\椤圭洰浠ｇ爜\TradePack\G03璐告槗甯冨尮妫楠孿U_TradeClothInspList.pas - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -148,7 +123,7 @@ - + @@ -212,5 +187,7 @@ + + diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.identcache b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.identcache index 6288545..d687f35 100644 Binary files a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.identcache and b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.identcache differ diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.res b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.res index 1b34824..6c58c9e 100644 Binary files a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.res and b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/DjdMachineInsp.res differ diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/ProjectGroup1.groupproj.local b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/ProjectGroup1.groupproj.local index ddaeb50..4d52dfb 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/ProjectGroup1.groupproj.local +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/ProjectGroup1.groupproj.local @@ -1,6 +1,6 @@ 锘 - + diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_GetDllForm.pas b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_GetDllForm.pas index 1937ba8..3831d3b 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_GetDllForm.pas +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_GetDllForm.pas @@ -74,8 +74,8 @@ begin if trim(DataBaseStr) = '' then begin server := '101.132.143.144,7781'; - // dtbase := 'jingpinjydata'; - dtbase := 'rtbasicsdata'; + dtbase := 'jingleijydata'; +// dtbase := 'rtbasicsdata'; user := 'rtsa'; pswd := 'rightsoft@5740'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.dfm b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.dfm index e4991f5..7e5f3bd 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.dfm +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.dfm @@ -16,7 +16,7 @@ inherited frmMachRollMain: TfrmMachRollMain Tag = 999 Left = 0 Top = 0 - Width = 400 + Width = 491 Height = 736 Margins.Left = 0 Margins.Top = 0 @@ -51,8 +51,8 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = Button_setClick end object Piece: TcxTextEdit - Left = 241 - Top = 134 + Left = 240 + Top = 117 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -60,73 +60,74 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 164 end object Qty: TcxTextEdit - Left = 78 - Top = 134 + Left = 89 + Top = 148 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 9 - Width = 117 + Width = 105 end object FtyPCId: TcxTextEdit - Left = 78 - Top = 109 + Left = 89 + Top = 117 Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 8 OnClick = edtScanEnter - Width = 117 + Width = 105 end object Color: TcxTextEdit - Left = 241 - Top = 84 - Properties.ReadOnly = True - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 11 - Width = 164 - end - object ColorNo: TcxTextEdit - Left = 78 - Top = 84 - Properties.ReadOnly = True - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 7 - Width = 117 - end - object CodeName: TcxTextEdit - Left = 241 - Top = 59 - Properties.ReadOnly = True - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 10 - Width = 164 - end - object OrderNo: TcxTextEdit - Left = 78 - Top = 59 - Properties.ReadOnly = True - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 6 - Width = 117 - end - object BCIOID: TcxTextEdit - Left = 241 - Top = 109 + Left = 240 + Top = 86 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 12 Width = 164 end + object ColorNo: TcxTextEdit + Left = 89 + Top = 86 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 7 + Width = 105 + end + object CodeName: TcxTextEdit + Left = 240 + Top = 55 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 11 + Width = 164 + end + object OrderNo: TcxTextEdit + Left = 89 + Top = 55 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 6 + Width = 105 + end + object BCIOID: TcxTextEdit + Left = 10000 + Top = 10000 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 68 + Visible = False + Width = 144 + end object InputLen: TcxTextEdit Tag = 999 - Left = 78 - Top = 236 + Left = 89 + Top = 525 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -139,16 +140,16 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 19 + TabOrder = 34 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 38 - Width = 133 + Width = 121 end object BTPrint: TButton - Left = 259 - Top = 283 - Width = 140 + Left = 258 + Top = 572 + Width = 207 Height = 59 Caption = #25552' '#20132 Font.Charset = GB2312_CHARSET @@ -157,7 +158,7 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 23 + TabOrder = 38 OnClick = BTPrintClick end object Button_bad: TButton @@ -192,8 +193,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object Edit_pieceOrder: TcxTextEdit Tag = 999 - Left = 270 - Top = 182 + Left = 269 + Top = 232 AutoSize = False ParentFont = False Properties.ReadOnly = True @@ -205,15 +206,15 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 16 + TabOrder = 18 OnClick = Edit_pieceOrderClick Height = 31 Width = 20 end object Edit_fixLen: TcxTextEdit Tag = 999 - Left = 343 - Top = 182 + Left = 342 + Top = 232 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -225,15 +226,15 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 17 + TabOrder = 19 OnClick = edtScanEnter Height = 31 Width = 20 end object Tare: TcxTextEdit Tag = 999 - Left = 158 - Top = 283 + Left = 157 + Top = 572 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -245,7 +246,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 22 + TabOrder = 37 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 @@ -253,8 +254,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object Coefficient: TcxTextEdit Tag = 999 - Left = 78 - Top = 351 + Left = 89 + Top = 640 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -266,16 +267,16 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 24 + TabOrder = 39 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 37 - Width = 53 + Width = 41 end object InputWeight: TcxTextEdit Tag = 999 - Left = 78 - Top = 283 + Left = 89 + Top = 572 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -287,33 +288,33 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 21 + TabOrder = 36 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 - Width = 71 + Width = 59 end object BatchNO: TcxTextEdit - Left = 78 - Top = 182 + Left = 89 + Top = 232 AutoSize = False Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 14 + TabOrder = 16 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 31 - Width = 57 + Width = 45 end object PieceNo: TcxTextEdit - Left = 183 - Top = 182 + Left = 182 + Top = 232 AutoSize = False Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 15 + TabOrder = 17 Text = '1' OnClick = edtScanEnter OnKeyPress = InputLenKeyPress @@ -334,7 +335,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 29 + TabOrder = 44 Visible = False OnClick = edtScanEnter OnKeyPress = InputLenKeyPress @@ -342,8 +343,8 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 191 end object edtPacketNo: TcxTextEdit - Left = 409 - Top = 182 + Left = 408 + Top = 232 AutoSize = False ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -354,7 +355,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 18 + TabOrder = 20 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 31 @@ -362,7 +363,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object AOrdDefNote1: TcxRichEdit Left = 0 - Top = 405 + Top = 698 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssBoth @@ -374,7 +375,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 27 + TabOrder = 42 Height = 238 Width = 181 end @@ -390,14 +391,14 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ShowFocusRect = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 30 + TabOrder = 45 Visible = False Height = 122 Width = 280 end object grade: TcxComboBox - Left = 304 - Top = 236 + Left = 303 + Top = 525 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -412,7 +413,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 20 + TabOrder = 35 Text = #27491#21697 OnKeyPress = InputLenKeyPress Height = 38 @@ -450,8 +451,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object lblRuleConversion: TcxComboBox Tag = 2 - Left = 140 - Top = 351 + Left = 139 + Top = 640 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -473,7 +474,7 @@ inherited frmMachRollMain: TfrmMachRollMain StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 25 + TabOrder = 40 Text = #26080#38656#36716#25442 Height = 37 Width = 102 @@ -481,7 +482,7 @@ inherited frmMachRollMain: TfrmMachRollMain object packnote: TcxMemo Tag = 999 Left = 190 - Top = 405 + Top = 698 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssVertical @@ -493,7 +494,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 28 + TabOrder = 43 Height = 241 Width = 199 end @@ -531,7 +532,7 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 34 + TabOrder = 46 Visible = False Width = 124 end @@ -549,7 +550,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 35 + TabOrder = 47 Text = '100' Visible = False OnClick = edtScanEnter @@ -564,14 +565,14 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 36 + TabOrder = 48 Visible = False Width = 168 end object packPostBtn: TButton - Left = 251 - Top = 351 - Width = 148 + Left = 250 + Top = 640 + Width = 215 Height = 37 Caption = #25171#21253#25552#20132 Font.Charset = GB2312_CHARSET @@ -580,7 +581,7 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 26 + TabOrder = 41 OnClick = packPostBtnClick end object customStrField1: TcxTextEdit @@ -588,7 +589,7 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 37 + TabOrder = 49 Visible = False OnClick = edtScanEnter Width = 121 @@ -598,7 +599,7 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 38 + TabOrder = 50 Visible = False OnClick = edtScanEnter Width = 121 @@ -608,40 +609,38 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 39 + TabOrder = 51 Visible = False OnClick = edtScanEnter Width = 121 end object C_GramWeight: TcxTextEdit - Left = 10000 - Top = 10000 + Left = 240 + Top = 148 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 40 - Visible = False + TabOrder = 14 OnClick = edtScanEnter - Width = 121 + Width = 164 end object addLen: TcxTextEdit Left = 10000 Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 41 + TabOrder = 52 Visible = False OnClick = edtScanEnter Width = 121 end object addWet: TcxTextEdit - Left = 10000 - Top = 10000 + Left = 240 + Top = 179 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 42 - Visible = False + TabOrder = 15 OnClick = edtScanEnter - Width = 121 + Width = 164 end object bt_printmd: TButton Left = 10000 @@ -655,7 +654,7 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 43 + TabOrder = 53 Visible = False OnClick = bt_printmdClick end @@ -664,7 +663,7 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 44 + TabOrder = 54 Visible = False OnClick = edtScanEnter Width = 121 @@ -674,7 +673,7 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 45 + TabOrder = 55 Visible = False OnClick = edtScanEnter Width = 121 @@ -684,7 +683,7 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 10000 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 46 + TabOrder = 56 Visible = False OnClick = edtScanEnter Width = 121 @@ -695,19 +694,18 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 47 + TabOrder = 57 Visible = False Width = 164 end object customStrField3: TcxComboBox - Left = 10000 - Top = 10000 + Left = 89 + Top = 179 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 48 - Visible = False + TabOrder = 10 OnClick = edtScanEnter - Width = 145 + Width = 105 end object c_ecolor: TcxTextEdit Left = 10000 @@ -715,7 +713,7 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 49 + TabOrder = 58 Visible = False Width = 164 end @@ -734,7 +732,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 50 + TabOrder = 59 Visible = False OnClick = edit_roll_autoClick Height = 31 @@ -751,7 +749,7 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 55 + TabOrder = 63 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick @@ -768,7 +766,7 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 54 + TabOrder = 62 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick @@ -785,7 +783,7 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 53 + TabOrder = 61 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick @@ -802,7 +800,7 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 51 + TabOrder = 60 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick @@ -820,12 +818,167 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.OnButtonClick = customStrField5PropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 52 + TabOrder = 64 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick Width = 121 end + object C_GramWeight1: TcxTextEdit + Left = 239 + Top = 285 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 22 + Height = 31 + Width = 83 + end + object InputMeter: TcxTextEdit + Left = 89 + Top = 285 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 21 + Width = 95 + end + object C_GramWeight2: TcxTextEdit + Left = 377 + Top = 285 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 23 + Height = 31 + Width = 88 + end + object C_GramWeight3: TcxTextEdit + Left = 89 + Top = 325 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 24 + Height = 31 + Width = 92 + end + object ValidC_Width: TcxTextEdit + Left = 257 + Top = 325 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 25 + Width = 121 + end + object BDBC_Width: TcxTextEdit + Left = 89 + Top = 365 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 26 + Height = 31 + Width = 121 + end + object JingMi: TcxTextEdit + Left = 286 + Top = 485 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 33 + Height = 31 + Width = 121 + end + object WeiMi: TcxTextEdit + Left = 89 + Top = 485 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 32 + Height = 31 + Width = 121 + end + object color_diff: TcxButtonEdit + Left = 89 + Top = 405 + Hint = 'color_diff/'#39068#33394#24046#24322 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = hand_feelPropertiesButtonClick + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 28 + 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 = 29 + 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 = 30 + Height = 31 + Width = 121 + end + object hand_feel: 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 = 27 + Width = 121 + end + object color_light: TcxButtonEdit + Left = 286 + Top = 445 + 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 = 31 + Width = 121 + end object dxLayoutControl_packGroup_Root: TdxLayoutGroup AlignHorz = ahClient AlignVert = avTop @@ -836,7 +989,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.SizableVert = True AllowRemove = False Hidden = True - ItemIndex = 3 + ItemIndex = 4 Padding.Left = -15 Padding.Top = -5 Padding.AssignedValues = [lpavLeft, lpavTop] @@ -871,7 +1024,7 @@ inherited frmMachRollMain: TfrmMachRollMain AllowRemove = False CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=12]'#25195#25551#26465#30721'[/SIZE][/COLOR][/B]' Control = edtScan - ControlOptions.OriginalHeight = 28 + ControlOptions.OriginalHeight = 34 ControlOptions.OriginalWidth = 149 ControlOptions.ShowBorder = False OnCaptionClick = dxLayoutItem1CaptionClick @@ -896,18 +1049,20 @@ inherited frmMachRollMain: TfrmMachRollMain AllowRemove = False CaptionOptions.Text = #25351#31034#21333 Control = OrderNo - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 0 end object dxLayoutGroup_plan: TdxLayoutGroup Parent = dxLayoutControl_packGroup_Root - AlignHorz = ahRight + AlignHorz = ahLeft CaptionOptions.Text = #35746#21333#20449#24687#32452 CaptionOptions.Visible = False + SizeOptions.Height = 176 SizeOptions.Width = 721 AllowRemove = False + ItemIndex = 1 LayoutDirection = ldHorizontal Padding.Bottom = -10 Padding.Left = -10 @@ -919,7 +1074,7 @@ inherited frmMachRollMain: TfrmMachRollMain Parent = dxLayoutGroup_plan_1 CaptionOptions.Text = #26579#21378#32568#21495 Control = FtyPCId - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 2 @@ -928,7 +1083,7 @@ inherited frmMachRollMain: TfrmMachRollMain Parent = dxLayoutGroup_plan_1 CaptionOptions.Text = #33394#21495 Control = ColorNo - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 1 @@ -938,7 +1093,7 @@ inherited frmMachRollMain: TfrmMachRollMain AllowRemove = False CaptionOptions.Text = #25968#37327 Control = Qty - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 3 @@ -953,7 +1108,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.SizableVert = True SizeOptions.Width = 188 Hidden = True - ItemIndex = 3 + ItemIndex = 4 ShowBorder = False UseIndent = False Index = 0 @@ -966,7 +1121,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.SizableVert = True SizeOptions.Width = 201 Hidden = True - ItemIndex = 2 + ItemIndex = 4 ShowBorder = False UseIndent = False Index = 1 @@ -976,7 +1131,7 @@ inherited frmMachRollMain: TfrmMachRollMain AllowRemove = False CaptionOptions.Text = #21697#21517 Control = CodeName - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 0 @@ -986,29 +1141,31 @@ inherited frmMachRollMain: TfrmMachRollMain AllowRemove = False CaptionOptions.Text = #39068#33394 Control = Color - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 1 end object dxLayoutItem9: TdxLayoutItem Parent = dxLayoutGroup_plan_2 + SizeOptions.Width = 197 CaptionOptions.Text = #21305#25968 Control = Piece - ControlOptions.OriginalHeight = 25 - ControlOptions.OriginalWidth = 144 - ControlOptions.ShowBorder = False - Index = 3 - end - object dxLayoutItem10: TdxLayoutItem - Parent = dxLayoutGroup_plan_2 - CaptionOptions.Text = #21345#21495 - Control = BCIOID - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 144 ControlOptions.ShowBorder = False Index = 2 end + object dxLayoutItem10: TdxLayoutItem + AlignHorz = ahClient + AlignVert = avTop + CaptionOptions.Text = #21345#21495 + Control = BCIOID + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 144 + ControlOptions.ShowBorder = False + Index = -1 + end object dxLayoutItem11: TdxLayoutItem Parent = dxLayoutGroup_scan SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] @@ -1053,10 +1210,10 @@ inherited frmMachRollMain: TfrmMachRollMain AlignVert = avClient SizeOptions.Height = 29 SizeOptions.Width = 128 - CaptionOptions.Text = '[SIZE=12]'#26412#21378#32568#21495'[/SIZE]' + CaptionOptions.Text = '[SIZE=12]'#33853#33394'[/SIZE]' Control = BatchNO ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 57 + ControlOptions.OriginalWidth = 45 ControlOptions.ShowBorder = False Index = 0 end @@ -1083,7 +1240,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.Height = 26 SizeOptions.Width = 446 Hidden = True - ItemIndex = 1 + ItemIndex = 2 LayoutDirection = ldHorizontal ShowBorder = False Index = 0 @@ -1097,6 +1254,7 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True + SizeOptions.Height = 396 SizeOptions.Width = 747 AllowRemove = False LayoutDirection = ldHorizontal @@ -1112,10 +1270,10 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.SizableHorz = True SizeOptions.SizableVert = True SizeOptions.Width = 204 - CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=14]'#38271#24230'[/SIZE][/COLOR][/B]' + CaptionOptions.Text = '[B][COLOR=#FF0000][SIZE=14]'#23454#38469#38271#24230'[/SIZE][/COLOR][/B]' Control = InputLen ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 133 + ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = 0 end @@ -1129,7 +1287,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Text = '[COLOR=Red][SIZE=14]'#37325#37327'[/COLOR][/SIZE]' Control = InputWeight ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 71 + ControlOptions.OriginalWidth = 59 ControlOptions.ShowBorder = False Index = 0 end @@ -1226,7 +1384,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutEmptySpaceItem3: TdxLayoutEmptySpaceItem Parent = dxLayoutGroup_do2 AlignHorz = ahLeft - AlignVert = avClient + AlignVert = avTop SizeOptions.AssignedValues = [sovSizableHorz] SizeOptions.SizableHorz = True SizeOptions.Height = 10 @@ -1243,13 +1401,13 @@ inherited frmMachRollMain: TfrmMachRollMain Parent = dxLayoutAutoCreatedGroup1 AlignVert = avTop LayoutDirection = ldHorizontal - Index = 1 + Index = 7 end object dxLayoutAutoCreatedGroup5: TdxLayoutAutoCreatedGroup Parent = dxLayoutAutoCreatedGroup1 AlignVert = avClient LayoutDirection = ldHorizontal - Index = 0 + Index = 6 end object dxLayoutGroup1: TdxLayoutGroup Parent = dxLayoutGroup_do2 @@ -1312,7 +1470,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Text = #31995#25968 Control = Coefficient ControlOptions.OriginalHeight = 37 - ControlOptions.OriginalWidth = 53 + ControlOptions.OriginalWidth = 41 ControlOptions.ShowBorder = False Index = 0 end @@ -1423,7 +1581,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object dxLayoutAutoCreatedGroup4: TdxLayoutAutoCreatedGroup Parent = dxLayoutAutoCreatedGroup2 - AlignVert = avClient + AlignVert = avTop LayoutDirection = ldHorizontal Index = 1 end @@ -1442,7 +1600,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_Pattern: TdxLayoutItem CaptionOptions.Text = #33457#22411 Control = C_Pattern - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 124 ControlOptions.ShowBorder = False Index = -1 @@ -1458,7 +1616,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_StyleNo: TdxLayoutItem CaptionOptions.Text = #27454#21495 Control = C_StyleNo - ControlOptions.OriginalHeight = 19 + ControlOptions.OriginalHeight = 25 ControlOptions.OriginalWidth = 168 ControlOptions.ShowBorder = False Index = -1 @@ -1480,7 +1638,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField1: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041#36755#20837'1' Control = customStrField1 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1488,7 +1646,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField2: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041#36755#20837'2' Control = customStrField2 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1496,34 +1654,36 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_width: TdxLayoutItem CaptionOptions.Text = #38376#24133 Control = C_Width - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 end object dxLayoutItem_gram: TdxLayoutItem + Parent = dxLayoutGroup_plan_2 CaptionOptions.Text = #20811#37325 Control = C_GramWeight - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False - Index = -1 + Index = 3 end object dxLayoutItem_addlen: TdxLayoutItem CaptionOptions.Text = #21152#38271 Control = addLen - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 end object dxLayoutItem_addwet: TdxLayoutItem + Parent = dxLayoutGroup_plan_2 CaptionOptions.Text = #21152#37325 Control = addWet - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False - Index = -1 + Index = 4 end object dxLayoutItem_btprintmd: TdxLayoutItem CaptionOptions.Text = #25171#21360#30721#21333 @@ -1537,7 +1697,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_presentLen: TdxLayoutItem CaptionOptions.Text = #36192#36865#38271#24230 Control = presentLen - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1545,7 +1705,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_presentWeight: TdxLayoutItem CaptionOptions.Text = #36192#36865#37325#37327 Control = presentWeight - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1553,7 +1713,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_unitPieces: TdxLayoutItem CaptionOptions.Text = #25340#21305 Control = unitPieces - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1562,23 +1722,24 @@ inherited frmMachRollMain: TfrmMachRollMain SizeOptions.Width = 190 CaptionOptions.Text = #23458#25143 Control = custName - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 164 ControlOptions.ShowBorder = False Index = -1 end object dxLayoutItem_customStrField3: TdxLayoutItem + Parent = dxLayoutGroup_plan_1 CaptionOptions.Text = #33258#23450#20041'3' Control = customStrField3 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 145 ControlOptions.ShowBorder = False - Index = -1 + Index = 4 end object dxLayoutItem_ecolor: TdxLayoutItem CaptionOptions.Text = #33521#25991#39068#33394 Control = c_ecolor - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 164 ControlOptions.ShowBorder = False Index = -1 @@ -1594,7 +1755,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField4: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041'4' Control = customStrField4 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1602,7 +1763,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField8: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041'8' Control = customStrField8 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1610,7 +1771,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField7: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041'7' Control = customStrField7 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1618,7 +1779,7 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField6: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041'6' Control = customStrField6 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 @@ -1626,11 +1787,180 @@ inherited frmMachRollMain: TfrmMachRollMain object dxLayoutItem_customStrField5: TdxLayoutItem CaptionOptions.Text = #33258#23450#20041'5' Control = customStrField5 - ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalHeight = 31 ControlOptions.OriginalWidth = 121 ControlOptions.ShowBorder = False Index = -1 end + object dxLayoutItem_C_GramWeight1: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup6 + AlignVert = avClient + SizeOptions.Width = 129 + CaptionOptions.Text = #20811#37325'1' + Control = C_GramWeight1 + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 83 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutItem_InputMeter: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup6 + SizeOptions.Width = 178 + CaptionOptions.Text = #21407#31859#25968 + Control = InputMeter + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 95 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutAutoCreatedGroup6: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + LayoutDirection = ldHorizontal + Index = 0 + end + object dxLayoutItem_C_GramWeight2: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup6 + AlignVert = avClient + SizeOptions.Width = 134 + CaptionOptions.Text = #20811#37325'2' + Control = C_GramWeight2 + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 88 + ControlOptions.ShowBorder = False + Index = 2 + end + object dxLayoutItem_C_GramWeight3: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup7 + AlignVert = avClient + SizeOptions.Width = 175 + CaptionOptions.Text = #20811#37325'3' + Control = C_GramWeight3 + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 92 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutItem_ValidC_Width: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup7 + AlignHorz = ahLeft + AlignVert = avTop + CaptionOptions.Text = #26377#25928#24133#23485 + Control = ValidC_Width + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutItem_BDBC_Width: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup11 + AlignVert = avClient + CaptionOptions.Text = #36793#21040#36793#38376#24133 + Control = BDBC_Width + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutItem_hand_feel: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup11 + AlignHorz = ahLeft + CaptionOptions.Text = #25163#24863 + Control = hand_feel + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutItem_color_diff: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup8 + AlignHorz = ahLeft + AlignVert = avTop + CaptionOptions.Text = #39068#33394#24046#24322 + Control = color_diff + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutItem_TW_diff: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup8 + AlignVert = avClient + CaptionOptions.Text = #22836#23614#24046#24322 + Control = TW_diff + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + AlignVert = avTop + LayoutDirection = ldHorizontal + Index = 3 + end + object dxLayoutItem_LMR_diff: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup9 + AlignVert = avClient + CaptionOptions.Text = #24038#20013#21491#24046#24322 + Control = LMR_diff + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutItem_color_light: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup9 + AlignHorz = ahLeft + AlignVert = avTop + CaptionOptions.Text = #33394#24425#20142#24230 + Control = color_light + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutItem_JingMi: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup10 + AlignHorz = ahLeft + CaptionOptions.Text = #32463#23494 + Control = JingMi + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end + object dxLayoutItem_WeiMi: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup10 + AlignVert = avClient + CaptionOptions.Text = #32428#23494 + Control = WeiMi + ControlOptions.OriginalHeight = 31 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 0 + end + object dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + LayoutDirection = ldHorizontal + Index = 5 + end + object dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + AlignVert = avTop + LayoutDirection = ldHorizontal + Index = 4 + end + object dxLayoutAutoCreatedGroup11: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + LayoutDirection = ldHorizontal + Index = 2 + end + object dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup1 + AlignVert = avTop + LayoutDirection = ldHorizontal + Index = 1 + end end object Panel_right: TPanel [1] Left = 860 @@ -1779,7 +2109,7 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 57 end object Tv3BatchNO: TcxGridDBColumn - Caption = #26412#21378#32568#21495 + Caption = #33853#33394 DataBinding.FieldName = 'BatchNO' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -1887,9 +2217,10 @@ inherited frmMachRollMain: TfrmMachRollMain TabOrder = 1 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> - ClientRectBottom = 273 - ClientRectRight = 250 - ClientRectTop = 32 + ClientRectBottom = 271 + ClientRectLeft = 2 + ClientRectRight = 248 + ClientRectTop = 36 object cxTabSheet1: TcxTabSheet Caption = #24405#20837 ImageIndex = 0 @@ -1897,8 +2228,8 @@ inherited frmMachRollMain: TfrmMachRollMain Tag = 999 Left = 0 Top = 0 - Width = 250 - Height = 241 + Width = 246 + Height = 235 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2006,6 +2337,14 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.FieldName = 'SubtractQty' DataBinding.IsNullValueType = True end + object Tv2CIFType: TcxGridDBColumn + Caption = #30133#28857#31867#22411 + DataBinding.FieldName = 'CIFType' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGridLevel1: TcxGridLevel GridView = Tv2 @@ -2015,12 +2354,16 @@ inherited frmMachRollMain: TfrmMachRollMain object sheetLook: TcxTabSheet Caption = #26597#30475 ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object cxGrid1: TcxGrid Tag = 999 Left = 0 Top = 0 - Width = 250 - Height = 241 + Width = 246 + Height = 235 Align = alClient TabOrder = 0 object TV1: TcxGridDBTableView @@ -2252,7 +2595,7 @@ inherited frmMachRollMain: TfrmMachRollMain end end object dxPanel_mid: TdxPanel [2] - Left = 400 + Left = 491 Top = 0 Width = 340 Height = 736 @@ -2287,38 +2630,73 @@ inherited frmMachRollMain: TfrmMachRollMain ExplicitWidth = 338 ExplicitHeight = 286 inherited RadioGroup1: TRadioGroup - Top = 103 + Top = 227 Width = 336 - ExplicitTop = 103 + Height = 57 + Visible = False + ExplicitTop = 227 ExplicitWidth = 336 + ExplicitHeight = 57 end inherited dxPanel3: TdxPanel - Top = 235 + Top = 104 Width = 336 - ExplicitTop = 235 + Height = 123 + ExplicitTop = 104 ExplicitWidth = 336 + ExplicitHeight = 123 + inherited cxButton1: TcxButton + Left = 56 + Top = 77 + ExplicitLeft = 56 + ExplicitTop = 77 + end inherited cxButton2: TcxButton + Left = 189 + Top = 79 OnClick = cxButton2Click + ExplicitLeft = 189 + ExplicitTop = 79 end end inherited dxLayoutControl1: TdxLayoutControl - Top = 4 + Top = 5 Width = 336 OnDblClick = dxLayoutControl_packDblClick - ExplicitTop = 4 + ExplicitTop = 5 ExplicitWidth = 336 inherited CIFBeg: TcxTextEdit + Top = 48 OnEnter = edtScanEnter + ExplicitTop = 48 + end + inherited CIFEnd: TcxTextEdit + Top = 48 + ExplicitTop = 48 + end + inherited CIFQty: TcxTextEdit + Top = 48 + ExplicitTop = 48 + end + inherited CIFNumber: TcxTextEdit + Top = 3 + ExplicitTop = 3 end inherited IsSubtract: TcxCheckBox - ExplicitWidth = 60 - Width = 60 + Top = 3 + ExplicitTop = 3 + ExplicitWidth = 43 + Width = 43 end inherited SubtractQty: TcxTextEdit + Top = 3 Properties.OnEditValueChanged = nil + ExplicitTop = 3 end inherited cxCheck_len: TcxCheckBox + Top = 48 Properties.OnChange = frameBads1cxCheck_lenPropertiesChange + ExplicitTop = 48 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup ItemIndex = 1 @@ -2336,10 +2714,32 @@ inherited frmMachRollMain: TfrmMachRollMain Top = 153 end end + object CIFPoints: TcxTextEdit + Left = 98 + Top = 549 + TabOrder = 1 + Width = 121 + end + object cxLabel1: TcxLabel + Left = 48 + Top = 554 + Caption = #25187#20998 + end + object cxLabel2: TcxLabel + Left = 21 + Top = 593 + Caption = #30133#28857#25551#36848 + end + object CIFnote: TcxTextEdit + Left = 101 + Top = 592 + TabOrder = 4 + Width = 229 + end end object cxGroupBox_keys: TcxGroupBox [3] - Left = 428 - Top = 200 + Left = 491 + Top = 196 Caption = #34394#25311#38190#30424 ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -2356,10 +2756,10 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 245 Width = 319 inline FrameKeyBoard1: TFrameKeyBoard - Left = 2 - Top = 24 - Width = 315 - Height = 219 + Left = 4 + Top = 21 + Width = 311 + Height = 208 Align = alClient Font.Charset = ANSI_CHARSET Font.Color = clWindowText @@ -2368,15 +2768,15 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Style = [] ParentFont = False TabOrder = 0 - ExplicitLeft = 2 - ExplicitTop = 24 - ExplicitWidth = 315 - ExplicitHeight = 219 + ExplicitLeft = 4 + ExplicitTop = 21 + ExplicitWidth = 311 + ExplicitHeight = 208 inherited dxPanel1: TdxPanel - Width = 315 - Height = 219 - ExplicitWidth = 315 - ExplicitHeight = 219 + Width = 311 + Height = 208 + ExplicitWidth = 311 + ExplicitHeight = 208 inherited SpeedButton1: TSpeedButton OnClick = FrameKeyBoard1SpeedButton1Click end @@ -2438,13 +2838,19 @@ inherited frmMachRollMain: TfrmMachRollMain end end inherited loadProcess: TPanel - Top = 154 + Left = 579 + Top = 124 Width = 177 TabOrder = 4 - ExplicitTop = 154 + ExplicitLeft = 579 + ExplicitTop = 124 ExplicitWidth = 177 end inherited cxProgressBar2: TcxProgressBar + Left = 570 + Top = 74 + ExplicitLeft = 570 + ExplicitTop = 74 ExplicitHeight = 29 end inherited ADOQueryBaseCmd: TADOQuery diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.pas b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.pas index 5610375..6d192c8 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.pas +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_MachRollMain.pas @@ -18,7 +18,7 @@ uses cxGeometry, dxFramedControl, dxPanel, U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar, cxCurrencyEdit, Xml.XMLDoc, Xml.xmldom, Xml.XMLIntf, cxDateUtils, - System.DateUtils; + System.DateUtils, cxLabel; type TfrmMachRollMain = class(TfrmBaseList) @@ -262,6 +262,43 @@ type Tv3Column2: TcxGridDBColumn; cds_paramsaixunpage: TStringField; Tv3Column3: TcxGridDBColumn; + C_GramWeight1: TcxTextEdit; + dxLayoutItem_C_GramWeight1: TdxLayoutItem; + InputMeter: TcxTextEdit; + dxLayoutItem_InputMeter: TdxLayoutItem; + dxLayoutAutoCreatedGroup6: TdxLayoutAutoCreatedGroup; + C_GramWeight2: TcxTextEdit; + dxLayoutItem_C_GramWeight2: TdxLayoutItem; + C_GramWeight3: TcxTextEdit; + dxLayoutItem_C_GramWeight3: TdxLayoutItem; + ValidC_Width: TcxTextEdit; + BDBC_Width: TcxTextEdit; + JingMi: TcxTextEdit; + WeiMi: TcxTextEdit; + color_diff: TcxButtonEdit; + TW_diff: TcxButtonEdit; + LMR_diff: TcxButtonEdit; + hand_feel: TcxButtonEdit; + color_light: TcxButtonEdit; + dxLayoutItem_ValidC_Width: TdxLayoutItem; + dxLayoutItem_BDBC_Width: TdxLayoutItem; + dxLayoutItem_hand_feel: TdxLayoutItem; + dxLayoutItem_color_diff: TdxLayoutItem; + dxLayoutItem_TW_diff: TdxLayoutItem; + dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup; + dxLayoutItem_LMR_diff: TdxLayoutItem; + dxLayoutItem_color_light: TdxLayoutItem; + dxLayoutItem_JingMi: TdxLayoutItem; + dxLayoutItem_WeiMi: TdxLayoutItem; + dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup; + dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup; + dxLayoutAutoCreatedGroup11: TdxLayoutAutoCreatedGroup; + dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup; + CIFPoints: TcxTextEdit; + cxLabel1: TcxLabel; + cxLabel2: TcxLabel; + CIFnote: TcxTextEdit; + Tv2CIFType: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure Button_badClick(Sender: TObject); @@ -309,6 +346,7 @@ type procedure customStrField5DblClick(Sender: TObject); procedure customStrField5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton1Click(Sender: TObject); + procedure hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private FCIID, FOperationStatus, FCIFName, FWorkshop: string; FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string; @@ -368,6 +406,7 @@ type function getCurMaxPieceNo(): integer; type + public fmanage, canshu1: string; fFlileFlag: string; @@ -383,7 +422,7 @@ implementation uses U_DataLink, U_ControlData, U_ParamSet, U_RTFun, U_globalVar, U_FormLayOutDesign, U_ZDYHelp, U_iniParam, U_ProductListHelp, U_SysLogList, - U_MdPrint; + U_MdPrint, U_CDList; {$R *.dfm} /// /////////////////////////////// @@ -1632,6 +1671,8 @@ begin flagname := '疵点'; fnote := true; V1Note.Caption := '英文名称'; + V1note1.Caption := '疵点类型'; + if ShowModal = 1 then begin Self.frameBads1.InitBadPanel(); @@ -2297,6 +2338,8 @@ begin end; procedure TfrmMachRollMain.cxButton2Click(Sender: TObject); +var + CIFType : string; begin inherited; if FCIFName = '' then @@ -2305,33 +2348,44 @@ begin exit; end; + with ADOQueryBaseTemp do + begin + Close; + SQL.Clear; + sql.Add('select A.*,ZJM=dbo.getPinYin(A.ZdyName) from KH_ZDY A where A.Type=''WFBCD'' and ZDYName='+QuotedStr(trim(FCIFName))); +// ShowMessage(sql.Text); + Open; + end; + CIFType := ADOQueryBaseTemp.FieldByName('note1').AsString; with CDS_2 do begin Append; - if frameBads1.RadioGroup1.ItemIndex = 5 then - FieldByName('CIFName').Value := '连续性' + Trim(FCIFName) - else if frameBads1.RadioGroup1.ItemIndex = 4 then - FieldByName('CIFName').Value := '整匹' + Trim(FCIFName) - else - fieldbyName('CIFName').value := trim(FCIFName); +// if frameBads1.RadioGroup1.ItemIndex = 5 then +// FieldByName('CIFName').Value := '连续性' + Trim(FCIFName) +// else if frameBads1.RadioGroup1.ItemIndex = 4 then +// FieldByName('CIFName').Value := '整匹' + Trim(FCIFName) +// else + fieldbyName('CIFName').value := trim(FCIFName); fieldbyName('CIFbeg').value := trim(frameBads1.CIFBeg.Text); fieldbyName('CIFEnd').value := trim(frameBads1.CIFEnd.Text); fieldbyName('CIFNumber').value := strtointdef(trim(frameBads1.CIFNumber.Text), 0); - fieldbyName('CIFPoints').value := 0; + fieldbyName('CIFPoints').value := StrToFloatDef(trim(CIFPoints.Text), 0); + fieldbyName('CIFnote').value := trim(CIFnote.Text); + fieldbyName('CIFType').value := trim(CIFType); +// if frameBads1.RadioGroup1.ItemIndex > -1 then +// begin +// if frameBads1.RadioGroup1.ItemIndex < 3 then +// begin +// fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1; +// end +// else +// begin +// fieldbyName('CIFPoints').value := 4; +// end; +// end; - if frameBads1.RadioGroup1.ItemIndex > -1 then - begin - if frameBads1.RadioGroup1.ItemIndex < 3 then - begin - fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1; - end - else - begin - fieldbyName('CIFPoints').value := 4; - end; - end; fieldbyName('CIFQty').value := strtofloatdef(trim(frameBads1.CIFQty.Text), 0); fieldbyName('SubtractQty').value := strtofloatdef(trim(frameBads1.SubtractQty.Text), 0); fieldbyName('IsSubtract').value := frameBads1.IsSubtract.Checked; @@ -2341,6 +2395,8 @@ begin frameBads1.CIFBeg.Text := ''; frameBads1.CIFEnd.Text := ''; frameBads1.CIFQty.Text := ''; + CIFPoints.Text := ''; + CIFnote.Text := ''; frameBads1.dxPanel1.Visible := false; cxPageControl1.ActivePageIndex := 0; end; @@ -2713,6 +2769,21 @@ begin fieldbyName('customStrField7').value := trim(customStrField7.Text); fieldbyName('customStrField8').value := trim(customStrField8.Text); + /// 新加的一堆 /// + fieldbyName('InputMeter').value := trim(InputMeter.Text); + fieldbyName('C_GramWeight1').value := trim(C_GramWeight1.Text); + fieldbyName('C_GramWeight2').value := trim(C_GramWeight2.Text); + fieldbyName('C_GramWeight3').value := trim(C_GramWeight3.Text); + fieldbyName('ValidC_Width').value := trim(ValidC_Width.Text); + fieldbyName('BDBC_Width').value := trim(BDBC_Width.Text); + fieldbyName('hand_feel').value := trim(hand_feel.Text); + fieldbyName('color_diff').value := trim(color_diff.Text); + fieldbyName('TW_diff').value := trim(TW_diff.Text); + fieldbyName('LMR_diff').value := trim(LMR_diff.Text); + fieldbyName('color_light').value := trim(color_light.Text); + fieldbyName('JingMi').value := trim(JingMi.Text); + fieldbyName('WeiMi').value := trim(WeiMi.Text); + /// 新加的一堆 /// //拼匹 @@ -3323,6 +3394,32 @@ begin end; end; +procedure TfrmMachRollMain.hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +var + fsj: string; + FWZ: Integer; +begin + inherited; + fsj := Trim(TcxButtonEdit(Sender).Hint); + FWZ := Pos('/', fsj); + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := 'ClothInfo'; + flag := Copy(fsj, 1, FWZ - 1); + flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); + if ShowModal = 1 then + begin + TcxButtonEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + end; + end; + finally + frmZDYHelp.Free; + end; +end; + + ///////////////////////////////////// function TfrmMachRollMain.deletePack(packId: string): boolean; var diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.dfm b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.dfm index 6c366ca..ff8050f 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.dfm +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.dfm @@ -7,7 +7,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Color = clBtnFace Font.Height = -16 Position = poDefault - ExplicitLeft = -211 + ExplicitLeft = -154 + ExplicitTop = -30 ExplicitWidth = 1312 ExplicitHeight = 648 PixelsPerInch = 96 @@ -16,27 +17,28 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Left = 0 Top = 146 Width = 1296 - Height = 40 + Height = 44 Align = alTop AutoSize = True BevelInner = bvLowered TabOrder = 3 DesignSize = ( 1296 - 40) + 44) object Label31: TLabel Left = 14 - Top = 10 + Top = 12 Width = 96 Height = 21 Alignment = taCenter Anchors = [akLeft] Caption = #27599#39029#35760#24405#26465#25968 Layout = tlCenter + ExplicitTop = 10 end object LBCPAP: TLabel Left = 409 - Top = 12 + Top = 14 Width = 100 Height = 20 Alignment = taCenter @@ -44,26 +46,29 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = False Caption = #24403#21069#39029'/'#24635#39029#25968 Layout = tlCenter + ExplicitTop = 12 end object BTLP: TButton Left = 325 - Top = 10 + Top = 12 Width = 78 Height = 27 Anchors = [akLeft] Caption = #19978#19968#39029 TabOrder = 0 OnClick = BTLPClick + ExplicitTop = 10 end object BTNP: TButton Left = 525 - Top = 10 + Top = 12 Width = 78 Height = 28 Anchors = [akLeft] Caption = #19979#19968#39029 TabOrder = 1 OnClick = BTNPClick + ExplicitTop = 10 end object TCBNOR: TcxComboBox Tag = 2 @@ -99,8 +104,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end end object cxGrid1: TcxGrid [1] - Left = -40 - Top = 192 + Left = -38 + Top = 193 Width = 1296 Height = 390 BorderStyle = cxcbsNone @@ -562,6 +567,110 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1InputMeter: TcxGridDBColumn + Caption = #21407#31859#25968 + DataBinding.FieldName = 'InputMeter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1C_GramWeight1: TcxGridDBColumn + Caption = #20811#37325'1' + DataBinding.FieldName = 'C_GramWeight1' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1C_GramWeight2: TcxGridDBColumn + Caption = #20811#37325'2' + DataBinding.FieldName = 'C_GramWeight2' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1C_GramWeight3: TcxGridDBColumn + Caption = #20811#37325'3' + DataBinding.FieldName = 'C_GramWeight3' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1ValidC_Width: TcxGridDBColumn + Caption = #26377#25928#24133#23485 + DataBinding.FieldName = 'ValidC_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1BDBC_Width: TcxGridDBColumn + Caption = #36793#21040#36793#38376#24133 + DataBinding.FieldName = 'BDBC_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1hand_feel: TcxGridDBColumn + Caption = #25163#24863 + DataBinding.FieldName = 'hand_feel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1color_diff: TcxGridDBColumn + Caption = #39068#33394#24046#24322 + DataBinding.FieldName = 'color_diff' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1TW_diff: TcxGridDBColumn + Caption = #22836#23614#24046#24322 + DataBinding.FieldName = 'TW_diff' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1LMR_diff: TcxGridDBColumn + Caption = #24038#20013#21491#24046#24322 + DataBinding.FieldName = 'LMR_diff' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1color_light: TcxGridDBColumn + Caption = #33394#24425#20142#24230 + DataBinding.FieldName = 'color_light' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1JingMi: TcxGridDBColumn + Caption = #32463#23494 + DataBinding.FieldName = 'JingMi' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end + object Tv1WeiMi: TcxGridDBColumn + Caption = #32428#23494 + DataBinding.FieldName = 'WeiMi' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 60 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -742,7 +851,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object OrderNo: TcxTextEdit Tag = 2 Left = 296 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -753,7 +862,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object conNO: TcxTextEdit Tag = 2 Left = 464 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -764,7 +873,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object CIID: TcxTextEdit Tag = 2 Left = 731 - Top = 30 + Top = 39 Hint = '1' Style.HotTrack = False Style.TransparentBorder = False @@ -775,7 +884,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object C_Name: TcxTextEdit Tag = 2 Left = 478 - Top = 30 + Top = 39 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -786,7 +895,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object C_Color: TcxTextEdit Tag = 2 Left = 613 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -797,7 +906,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object BCIOID: TcxTextEdit Tag = 2 Left = 880 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -808,7 +917,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object CIMachNo: TcxTextEdit Tag = 1 Left = 892 - Top = 30 + Top = 39 Hint = '1' Style.HotTrack = False Style.TransparentBorder = False @@ -819,7 +928,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object C_Pattern: TcxTextEdit Tag = 2 Left = 609 - Top = 30 + Top = 39 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -830,7 +939,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object C_Code: TcxTextEdit Tag = 2 Left = 307 - Top = 30 + Top = 39 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -841,7 +950,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object C_EColor: TcxTextEdit Tag = 2 Left = 750 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -852,7 +961,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object BatchNO: TcxTextEdit Tag = 2 Left = 1008 - Top = 0 + Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False @@ -863,7 +972,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object grade: TcxComboBox Tag = 1 Left = 1002 - Top = 30 + Top = 39 Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( #27491#21697 @@ -888,14 +997,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Properties.OnChange = CIIOFlagPropertiesChange Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 20 + TabOrder = 17 Visible = False Height = 30 Width = 78 end object BegDate: TcxDateEdit Left = 124 - Top = 0 + Top = 6 Properties.ImmediatePost = True Properties.SaveTime = False Properties.ShowTime = False @@ -906,7 +1015,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end object EndDate: TcxDateEdit Left = 111 - Top = 30 + Top = 39 Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False @@ -915,7 +1024,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end object IsJYTime: TcxCheckBox Left = 16 - Top = 0 + Top = 6 ParentFont = False Properties.ImmediatePost = True State = cbsChecked @@ -927,25 +1036,25 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object custName: TcxTextEdit Tag = 2 Left = 1131 - Top = 30 + Top = 39 Hint = '0' AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 16 OnKeyPress = KHConNOKeyPress - Height = 29 + Height = 33 Width = 88 end object C_StyleNo: TcxTextEdit Tag = 2 Left = 1145 - Top = 0 + Top = 6 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 8 - Height = 30 + Height = 33 Width = 74 end object dxLayoutControl_queryGroup_Root: TdxLayoutGroup @@ -989,7 +1098,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AllowRemove = False CaptionOptions.Text = #26816#39564#26085#26399 Control = BegDate - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 107 ControlOptions.ShowBorder = False Index = 1 @@ -1002,7 +1111,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 159 CaptionOptions.Text = #35746#21333#21495 Control = OrderNo - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 103 ControlOptions.ShowBorder = False Index = 2 @@ -1016,7 +1125,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AllowRemove = False CaptionOptions.Text = #33267 Control = EndDate - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 115 ControlOptions.ShowBorder = False Index = 1 @@ -1029,7 +1138,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 162 CaptionOptions.Text = #20135#21697#32534#21495 Control = C_Code - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 90 ControlOptions.ShowBorder = False Index = 2 @@ -1042,7 +1151,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 154 CaptionOptions.Text = #21697#21517#20013#25991 Control = C_Name - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 82 ControlOptions.ShowBorder = False Index = 3 @@ -1054,7 +1163,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableVert = True CaptionOptions.Text = #21512#21516#21495 Control = conNO - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 100 ControlOptions.ShowBorder = False Index = 3 @@ -1067,7 +1176,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 96 CaptionOptions.Text = #39068#33394 Control = C_Color - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 56 ControlOptions.ShowBorder = False Index = 4 @@ -1080,7 +1189,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 97 CaptionOptions.Text = #33457#22411 Control = C_Pattern - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 57 ControlOptions.ShowBorder = False Index = 4 @@ -1094,7 +1203,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 135 CaptionOptions.Text = #32568#26465#30721 Control = BCIOID - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 79 ControlOptions.ShowBorder = False Index = 6 @@ -1108,7 +1217,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 136 CaptionOptions.Text = #21367#26465#30721 Control = CIID - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 80 ControlOptions.ShowBorder = False Index = 5 @@ -1121,7 +1230,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 137 CaptionOptions.Text = #39068#33394#33521#25991 Control = C_EColor - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 65 ControlOptions.ShowBorder = False Index = 5 @@ -1135,7 +1244,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 133 CaptionOptions.Text = #26816#39564#26426#21488 Control = CIMachNo - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 61 ControlOptions.ShowBorder = False Index = 6 @@ -1162,7 +1271,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.Width = 120 CaptionOptions.Text = #31561#32423 Control = grade - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 80 ControlOptions.ShowBorder = False Index = 7 @@ -1175,7 +1284,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableVert = True CaptionOptions.Text = #32568#21495 Control = BatchNO - ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalHeight = 33 ControlOptions.OriginalWidth = 88 ControlOptions.ShowBorder = False Index = 7 @@ -1192,7 +1301,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList CaptionOptions.Visible = False Control = IsJYTime ControlOptions.OriginalHeight = 30 - ControlOptions.OriginalWidth = 13 + ControlOptions.OriginalWidth = 18 ControlOptions.ShowBorder = False Index = 0 end diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.pas b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.pas index 3f7c59c..1cc012d 100644 --- a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.pas +++ b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/U_TradeClothInspList.pas @@ -172,6 +172,19 @@ type dxLayoutItem18: TdxLayoutItem; C_StyleNo: TcxTextEdit; dxLayoutItem19: TdxLayoutItem; + Tv1InputMeter: TcxGridDBColumn; + Tv1C_GramWeight1: TcxGridDBColumn; + Tv1C_GramWeight2: TcxGridDBColumn; + Tv1C_GramWeight3: TcxGridDBColumn; + Tv1ValidC_Width: TcxGridDBColumn; + Tv1BDBC_Width: TcxGridDBColumn; + Tv1hand_feel: TcxGridDBColumn; + Tv1color_diff: TcxGridDBColumn; + Tv1TW_diff: TcxGridDBColumn; + Tv1LMR_diff: TcxGridDBColumn; + Tv1color_light: TcxGridDBColumn; + Tv1JingMi: TcxGridDBColumn; + Tv1WeiMi: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.identcache b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.identcache index 9c9da2a..86b6f7a 100644 Binary files a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.identcache and b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.identcache differ diff --git a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.res b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.res index 2465ca0..e116c48 100644 Binary files a/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.res and b/椤圭洰浠ｇ爜/DJ/G03璐告槗甯冨尮妫楠/testDll.res differ