diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof index 6aa4516..625b26d 100644 --- a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof +++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\¶¡µÏ·å¿ª·¢´úÂë\ÏîÄ¿´úÂë\Âú·å\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe +HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\D7fhManfeng\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.skincfg b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.skincfg new file mode 100644 index 0000000..89edbfe --- /dev/null +++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinBlack=1 +dxSkinBlue=1 +dxSkinBlueprint=1 +dxSkinCaramel=1 +dxSkinCoffee=1 +dxSkinDarkRoom=1 +dxSkinDarkSide=1 +dxSkinDevExpressDarkStyle=1 +dxSkinDevExpressStyle=1 +dxSkinFoggy=1 +dxSkinGlassOceans=1 +dxSkinHighContrast=1 +dxSkiniMaginary=1 +dxSkinLilian=1 +dxSkinLiquidSky=1 +dxSkinLondonLiquidSky=1 +dxSkinMcSkin=1 +dxSkinMetropolis=1 +dxSkinMetropolisDark=1 +dxSkinMoneyTwins=1 +dxSkinOffice2007Black=1 +dxSkinOffice2007Blue=1 +dxSkinOffice2007Green=1 +dxSkinOffice2007Pink=1 +dxSkinOffice2007Silver=1 +dxSkinOffice2010Black=1 +dxSkinOffice2010Blue=1 +dxSkinOffice2010Silver=1 +dxSkinOffice2013DarkGray=1 +dxSkinOffice2013LightGray=1 +dxSkinOffice2013White=1 +dxSkinPumpkin=1 +dxSkinSeven=1 +dxSkinSevenClassic=1 +dxSkinSharp=1 +dxSkinSharpPlus=1 +dxSkinSilver=1 +dxSkinSpringTime=1 +dxSkinStardust=1 +dxSkinSummer2008=1 +dxSkinTheAsphaltWorld=1 +dxSkinsDefaultPainters=1 +dxSkinValentine=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas index 8703976..32475c8 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas @@ -75,11 +75,11 @@ begin SetLength(pswd, 255); if trim(DataBaseStr) = '' then begin - server := '121.40.233.100,7781'; + server := '121.37.171.80,7781'; // server := '.'; dtbase := 'manfengdata'; - user := 'sa'; - pswd := 'rightsoft@123'; + user := 'manfengsa'; + pswd := 'rightsoft@8811'; // pswd := 'rightsoft'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm index 0a619a5..45eb0c3 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm @@ -486,7 +486,7 @@ object frmMarkingInspection: TfrmMarkingInspection TabOrder = 2 object Label9: TLabel Left = 164 - Top = 192 + Top = 215 Width = 15 Height = 22 Caption = 'M' @@ -500,7 +500,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label4: TLabel Left = 164 - Top = 101 + Top = 91 Width = 28 Height = 22 Caption = 'KG' @@ -513,7 +513,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label5: TLabel Left = 13 - Top = 191 + Top = 267 Width = 40 Height = 23 Caption = #38271#24230 @@ -526,7 +526,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label11: TLabel Left = 13 - Top = 101 + Top = 91 Width = 40 Height = 23 Caption = #27611#37325 @@ -539,7 +539,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label10: TLabel Left = 43 - Top = 381 + Top = 407 Width = 40 Height = 23 Caption = #27491#21697 @@ -552,7 +552,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label12: TLabel Left = 202 - Top = 381 + Top = 407 Width = 40 Height = 22 Caption = #27425#21697 @@ -565,7 +565,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label26: TLabel Left = 43 - Top = 425 + Top = 451 Width = 40 Height = 22 Caption = #20986#32440 @@ -577,8 +577,8 @@ object frmMarkingInspection: TfrmMarkingInspection ParentFont = False end object Label30: TLabel - Left = 41 - Top = 629 + Left = 12 + Top = 134 Width = 40 Height = 23 Caption = #30382#37325 @@ -588,11 +588,10 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Name = 'Arial' Font.Style = [] ParentFont = False - Visible = False end object Label31: TLabel - Left = 192 - Top = 676 + Left = 163 + Top = 176 Width = 28 Height = 22 Caption = 'KG' @@ -602,11 +601,10 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Name = 'Arial' Font.Style = [] ParentFont = False - Visible = False end object Label32: TLabel - Left = 41 - Top = 676 + Left = 12 + Top = 176 Width = 40 Height = 23 Caption = #20928#37325 @@ -616,11 +614,10 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Name = 'Arial' Font.Style = [] ParentFont = False - Visible = False end object Label33: TLabel - Left = 192 - Top = 629 + Left = 163 + Top = 134 Width = 28 Height = 22 Caption = 'KG' @@ -630,11 +627,10 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Name = 'Arial' Font.Style = [] ParentFont = False - Visible = False end object Label34: TLabel Left = 43 - Top = 467 + Top = 493 Width = 40 Height = 22 Caption = #20221#25968 @@ -647,7 +643,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label36: TLabel Left = 13 - Top = 55 + Top = 49 Width = 40 Height = 23 Caption = #21367#21495 @@ -674,7 +670,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label38: TLabel Left = 11 - Top = 146 + Top = 220 Width = 40 Height = 23 Caption = #31995#25968 @@ -687,7 +683,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label3: TLabel Left = 205 - Top = 146 + Top = 132 Width = 40 Height = 23 Caption = #29677#21035 @@ -700,7 +696,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label6: TLabel Left = 205 - Top = 237 + Top = 221 Width = 40 Height = 23 Caption = #26694#21495 @@ -713,7 +709,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label13: TLabel Left = 205 - Top = 100 + Top = 90 Width = 40 Height = 23 Caption = #20811#37325 @@ -726,7 +722,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label15: TLabel Left = 205 - Top = 55 + Top = 49 Width = 40 Height = 23 Caption = #38376#24133 @@ -739,7 +735,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label14: TLabel Left = 47 - Top = 318 + Top = 349 Width = 40 Height = 46 Caption = #20462#25913#13#10#21367#21495 @@ -765,7 +761,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object BTPrint: TSpeedButton Left = 92 - Top = 504 + Top = 530 Width = 137 Height = 69 Caption = #25552#20132 @@ -778,8 +774,8 @@ object frmMarkingInspection: TfrmMarkingInspection OnClick = SpeedButton19Click end object Label22: TLabel - Left = 13 - Top = 238 + Left = 202 + Top = 269 Width = 40 Height = 23 Caption = #32568#21495 @@ -792,7 +788,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Label24: TLabel Left = 49 - Top = 283 + Top = 314 Width = 40 Height = 23 Caption = #20943#38271 @@ -805,7 +801,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MJLen: TEdit Left = 57 - Top = 182 + Top = 258 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -820,7 +816,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MJMaoZ: TEdit Left = 57 - Top = 92 + Top = 82 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -836,7 +832,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Button5: TButton Left = 253 - Top = 527 + Top = 553 Width = 80 Height = 45 Caption = #37325#25171 @@ -852,7 +848,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Edit3: TEdit Left = 87 - Top = 371 + Top = 397 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -869,7 +865,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Edit4: TEdit Left = 249 - Top = 371 + Top = 397 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -885,7 +881,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Edit6: TEdit Left = 249 - Top = 415 + Top = 441 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -901,8 +897,8 @@ object frmMarkingInspection: TfrmMarkingInspection OnKeyPress = MJstr3KeyPress end object MJQty3: TEdit - Left = 85 - Top = 620 + Left = 56 + Top = 125 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -912,13 +908,13 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Style = [fsBold] ParentFont = False TabOrder = 3 - Visible = False + OnChange = MJQty3Change OnClick = Edit1Click OnKeyPress = MJstr3KeyPress end object MJQty4: TEdit - Left = 85 - Top = 667 + Left = 56 + Top = 167 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -928,14 +924,13 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Style = [fsBold] ParentFont = False TabOrder = 4 - Visible = False OnClick = Edit1Click OnExit = MJQty4Exit OnKeyPress = MJQty4KeyPress end object ComboBox1: TComboBox Left = 249 - Top = 458 + Top = 484 Width = 40 Height = 40 Style = csDropDownList @@ -973,7 +968,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object mjxh: TEdit Left = 57 - Top = 46 + Top = 40 Width = 101 Height = 41 Font.Charset = GB2312_CHARSET @@ -988,7 +983,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MJBanZu: TComboBox Left = 249 - Top = 137 + Top = 123 Width = 102 Height = 40 Style = csDropDownList @@ -1009,7 +1004,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object KuangHao: TEdit Left = 249 - Top = 228 + Top = 212 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1024,7 +1019,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object KuWei: TEdit Left = 249 - Top = 182 + Top = 168 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1039,7 +1034,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Button3: TButton Left = 199 - Top = 182 + Top = 168 Width = 46 Height = 41 Caption = #24211#20301 @@ -1054,7 +1049,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MJKZ: TEdit Left = 249 - Top = 91 + Top = 81 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1070,7 +1065,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MJMF: TEdit Left = 249 - Top = 46 + Top = 40 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1087,7 +1082,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Edit5: TEdit Left = 103 - Top = 320 + Top = 351 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1102,7 +1097,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Button6: TButton Left = 231 - Top = 318 + Top = 349 Width = 80 Height = 45 Caption = #30830#35748 @@ -1116,8 +1111,8 @@ object frmMarkingInspection: TfrmMarkingInspection OnClick = Button6Click end object JYXH: TComboBox - Left = 57 - Top = 229 + Left = 246 + Top = 260 Width = 102 Height = 40 Font.Charset = ANSI_CHARSET @@ -1133,7 +1128,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object MKXS: TEdit Left = 57 - Top = 137 + Top = 211 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1148,7 +1143,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Ekjlen: TEdit Left = 103 - Top = 274 + Top = 305 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -1163,7 +1158,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Button9: TButton Left = 231 - Top = 270 + Top = 301 Width = 80 Height = 45 Caption = #25442#22823#21367 diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas index 8625ed7..dfbb91a 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas @@ -278,6 +278,7 @@ type procedure ToolButton8Click(Sender: TObject); procedure Button8Click(Sender: TObject); procedure Button7Click(Sender: TObject); + procedure MJQty3Change(Sender: TObject); private { Private declarations } FColumn, FAPID, FMainId, FSubId, FFFMJID, FOperationStatus: string; @@ -1123,7 +1124,7 @@ begin // FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(Trim(Ekjlen.Text),0); // end; //Æ¤ÖØ -// FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); + FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); // Ã«ÖØ if FOperationStatus = 'ÖØÐÂɨÃè' then begin @@ -1141,7 +1142,7 @@ begin end; FieldByName('KongJiaWei').Value := FKongJiaWei; //¾»ÖØ -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) - StrToFloatdef(trim(MJQty3.Text), 0); + FieldByName('MJQty4').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) - StrToFloatdef(trim(MJQty3.Text), 0); //ϵÊý FieldByName('MKXS').Value := StrToFloatdef(trim(MKXS.Text), 0); @@ -2467,5 +2468,32 @@ begin end; end; +procedure TfrmMarkingInspection.MJQty3Change(Sender: TObject); +var + FReal: Double; +begin + if Trim(MJMaoZ.Text) = '' then + begin + MJQty4.Text := ''; + Exit; + end; + if TryStrToFloat(MJMaoZ.Text, FReal) = False then + Exit; + if Trim(MJQty3.Text) <> '' then + begin + if TryStrToFloat(MJQty3.Text, FReal) = False then + Exit; + MJQty4.Text := FloatToStr(StrToFloat(MJMaoZ.Text) - StrToFloat(MJQty3.Text)); + end + else + begin + MJQty4.Text := MJMaoZ.Text; + end; + if strtofloatdef(trim(MKXS.Text), 0) <> 0 then + begin + MJLen.Text := format('%.1f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(MKXS.Text), 0)]); + end; +end; + end. diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm index 6d415b7..93198e9 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm @@ -1,6 +1,6 @@ object frmOrderInPut: TfrmOrderInPut - Left = 323 - Top = 69 + Left = 234 + Top = 373 Width = 1117 Height = 743 Caption = #25351#31034#21333#24405#20837 @@ -18,7 +18,7 @@ object frmOrderInPut: TfrmOrderInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1101 + Width = 1109 Height = 29 ButtonHeight = 30 ButtonWidth = 107 @@ -66,7 +66,7 @@ object frmOrderInPut: TfrmOrderInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1101 + Width = 1109 Height = 288 Align = alTop BevelInner = bvNone @@ -954,15 +954,15 @@ object frmOrderInPut: TfrmOrderInPut object cxPageControl1: TcxPageControl Left = 0 Top = 317 - Width = 1101 - Height = 387 + Width = 1109 + Height = 395 Align = alClient TabOrder = 2 Properties.ActivePage = cxTabSheet3 Properties.CustomButtons.Buttons = <> Properties.Style = 8 - ClientRectBottom = 387 - ClientRectRight = 1101 + ClientRectBottom = 395 + ClientRectRight = 1109 ClientRectTop = 23 object cxTabSheet3: TcxTabSheet Caption = #20135#21697#20449#24687 @@ -970,7 +970,7 @@ object frmOrderInPut: TfrmOrderInPut object ToolBar3: TToolBar Left = 0 Top = 0 - Width = 1101 + Width = 1109 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -1026,8 +1026,8 @@ object frmOrderInPut: TfrmOrderInPut object cxGrid2: TcxGrid Left = 0 Top = 32 - Width = 1101 - Height = 332 + Width = 1109 + Height = 340 Align = alClient TabOrder = 1 object TV2: TcxGridDBTableView diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas index b763075..2c7c5e9 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas @@ -11,7 +11,21 @@ uses StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit, RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, cxPC, Menus, - cxLookAndFeels, cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator; + cxLookAndFeels, cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, + dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmOrderInPut = class(TForm) diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm index 59fc7c4..bf258d5 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm @@ -19,7 +19,7 @@ object frmProductOrderList: TfrmProductOrderList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1240 + Width = 1248 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -162,16 +162,16 @@ object frmProductOrderList: TfrmProductOrderList object cxPageControl1: TcxPageControl Left = 0 Top = 162 - Width = 1240 - Height = 510 + Width = 1248 + Height = 518 Align = alClient TabOrder = 1 Properties.ActivePage = cxTabSheet4 Properties.CustomButtons.Buttons = <> Properties.Style = 8 OnChange = cxPageControl1Change - ClientRectBottom = 510 - ClientRectRight = 1240 + ClientRectBottom = 518 + ClientRectRight = 1248 ClientRectTop = 23 object cxTabSheet3: TcxTabSheet Caption = #22383#24067#24211#21015#34920 @@ -179,7 +179,7 @@ object frmProductOrderList: TfrmProductOrderList object cxTabControl2: TcxTabControl Left = 0 Top = 0 - Width = 1240 + Width = 1248 Height = 22 Align = alTop TabOrder = 0 @@ -192,14 +192,14 @@ object frmProductOrderList: TfrmProductOrderList #20840#37096) OnChange = cxTabControl2Change ClientRectBottom = 22 - ClientRectRight = 1240 + ClientRectRight = 1248 ClientRectTop = 22 end object cxGrid2: TcxGrid Left = 0 Top = 22 - Width = 1240 - Height = 465 + Width = 1248 + Height = 473 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clBtnShadow @@ -432,7 +432,7 @@ object frmProductOrderList: TfrmProductOrderList object cxTabControl1: TcxTabControl Left = 0 Top = 0 - Width = 1240 + Width = 1248 Height = 22 Align = alTop TabOrder = 0 @@ -446,14 +446,14 @@ object frmProductOrderList: TfrmProductOrderList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1240 + ClientRectRight = 1248 ClientRectTop = 22 end object cxGrid1: TcxGrid Left = 0 Top = 22 - Width = 1240 - Height = 465 + Width = 1248 + Height = 473 Align = alClient PopupMenu = PopupMenu1 TabOrder = 1 @@ -663,7 +663,7 @@ object frmProductOrderList: TfrmProductOrderList object Panel2: TPanel Left = 0 Top = 32 - Width = 1240 + Width = 1248 Height = 65 Align = alTop BevelInner = bvRaised @@ -838,7 +838,7 @@ object frmProductOrderList: TfrmProductOrderList object Panel1: TPanel Left = 0 Top = 97 - Width = 1240 + Width = 1248 Height = 65 Align = alTop BevelInner = bvRaised diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas index 7033bcb..b08461f 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas @@ -13,7 +13,21 @@ uses RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu, cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, cxCheckBox, cxDropDownEdit, cxLookAndFeels, - cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator; + cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator, dxSkinsCore, + dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, + dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmProductOrderList = class(TForm)