From bbdf959b939d57c3fd4e17ab094ccef66bff807d Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 22 Sep 2025 15:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=93=E5=8D=B0=E5=9D=AF?= =?UTF-8?q?=E5=B8=83=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectGroup1.bpg | 8 +- .../U_GetDllForm.pas | 19 +++-- .../U_JYOrderCDOne.dfm | 20 ++--- .../U_JYOrderCDOne.pas | 15 +++- .../U_MJManageNewFDJJAP.dfm | 75 ++++++++++--------- .../U_MJManageNewFDJJAP.pas | 31 ++++---- .../WeavingSchedule.dof | 2 +- 7 files changed, 93 insertions(+), 77 deletions(-) diff --git a/坯布生产计划(WeavingSchedule)/ProjectGroup1.bpg b/坯布生产计划(WeavingSchedule)/ProjectGroup1.bpg index 7c050f6..29d6bdc 100644 --- a/坯布生产计划(WeavingSchedule)/ProjectGroup1.bpg +++ b/坯布生产计划(WeavingSchedule)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = WeavingSchedule.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ +WeavingSchedule.dll: WeavingSchedule.dpr + $(DCC) + testDll.exe: testDll.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr - $(DCC) - diff --git a/坯布生产计划(WeavingSchedule)/U_GetDllForm.pas b/坯布生产计划(WeavingSchedule)/U_GetDllForm.pas index 6114530..d7f672f 100644 --- a/坯布生产计划(WeavingSchedule)/U_GetDllForm.pas +++ b/坯布生产计划(WeavingSchedule)/U_GetDllForm.pas @@ -68,19 +68,24 @@ begin SetLength(dtbase, 255); SetLength(user, 255); SetLength(pswd, 255); - - server := '121.40.233.100,7781'; + if Trim(DataBaseStr) = '' then + begin + server := '121.40.233.100,7781'; //server:='.'; - pswd := 'rightsoft@123'; + pswd := 'rightsoft@123'; - user := 'sa'; - dtbase := 'hanglindata'; + user := 'sa'; + dtbase := 'hanglindata'; + + DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := DataBaseStr; // DName := '̷'; // DParameters1 := 'BS'; //DParameters3:='1'; + end + else + DConString := DataBaseStr; + if not ConnData() then begin result := 0; diff --git a/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.dfm b/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.dfm index bc2a4c6..133528e 100644 --- a/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.dfm +++ b/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.dfm @@ -20,7 +20,7 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1250 + Width = 1258 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -165,7 +165,7 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB object Panel1: TPanel Left = 0 Top = 32 - Width = 1250 + Width = 1258 Height = 89 Align = alTop BevelInner = bvRaised @@ -649,8 +649,8 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB object cxGrid1: TcxGrid Left = 0 Top = 171 - Width = 1250 - Height = 339 + Width = 1258 + Height = 347 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -1094,7 +1094,7 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB object cxTabControl1: TcxTabControl Left = 0 Top = 121 - Width = 1250 + Width = 1258 Height = 25 Align = alTop TabOrder = 2 @@ -1107,13 +1107,13 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 25 - ClientRectRight = 1250 + ClientRectRight = 1258 ClientRectTop = 23 end object cxTabControl2: TcxTabControl Left = 0 Top = 146 - Width = 1250 + Width = 1258 Height = 25 Align = alTop TabOrder = 3 @@ -1121,7 +1121,7 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB Properties.Style = 8 OnChange = cxTabControl2Change ClientRectBottom = 25 - ClientRectRight = 1250 + ClientRectRight = 1258 ClientRectTop = 0 end object Panel4: TPanel @@ -1222,8 +1222,8 @@ object frmJYOrderCDOnePB: TfrmJYOrderCDOnePB end object Panel2: TPanel Left = 0 - Top = 510 - Width = 1250 + Top = 518 + Width = 1258 Height = 76 Align = alBottom BevelInner = bvRaised diff --git a/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.pas b/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.pas index 0c146f3..547fb69 100644 --- a/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.pas +++ b/坯布生产计划(WeavingSchedule)/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxPC, cxContainer, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookAndFeels, - cxLookAndFeelPainters, dxCore, cxDateUtils, cxNavigator, dxBarBuiltInMenu; + cxLookAndFeelPainters, dxCore, cxDateUtils, cxNavigator, dxBarBuiltInMenu, + 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 TfrmJYOrderCDOnePB = class(TForm) diff --git a/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.dfm b/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.dfm index f0ad1ae..da0f915 100644 --- a/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.dfm +++ b/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.dfm @@ -21,7 +21,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1334 + Width = 1342 Height = 30 AutoSize = True ButtonHeight = 30 @@ -182,7 +182,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP Left = 0 Top = 81 Width = 317 - Height = 602 + Height = 610 Align = alLeft TabOrder = 2 object SpeedButton13: TSpeedButton @@ -862,7 +862,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Panel1: TPanel Left = 0 Top = 30 - Width = 1334 + Width = 1342 Height = 51 Align = alTop BevelInner = bvRaised @@ -919,7 +919,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label33: TLabel Left = 857 Top = 13 - Width = 40 + Width = 36 Height = 23 Caption = #20986#32440 Font.Charset = ANSI_CHARSET @@ -946,7 +946,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object lblJYPS: TLabel Left = 504 Top = 11 - Width = 80 + Width = 72 Height = 23 Caption = #26816#39564#21305#25968 Font.Charset = ANSI_CHARSET @@ -1043,6 +1043,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP ParentFont = False ReadOnly = True TabOrder = 1 + Text = #8730 OnClick = Edit6Click end object GCCode: TEdit @@ -1083,7 +1084,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP Left = 317 Top = 81 Width = 270 - Height = 602 + Height = 610 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1105,7 +1106,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label11: TLabel Left = -103 Top = 534 - Width = 40 + Width = 36 Height = 23 Caption = #27611#37325 Font.Charset = ANSI_CHARSET @@ -1119,7 +1120,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label10: TLabel Left = 726 Top = 130 - Width = 20 + Width = 18 Height = 46 Caption = #27491#13#10#21697 Font.Charset = ANSI_CHARSET @@ -1133,7 +1134,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label12: TLabel Left = 786 Top = 350 - Width = 20 + Width = 18 Height = 44 Caption = #27425#13#10#21697 Font.Charset = ANSI_CHARSET @@ -1147,7 +1148,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label28: TLabel Left = 536 Top = 291 - Width = 40 + Width = 36 Height = 22 Caption = #30041#26679 Font.Charset = ANSI_CHARSET @@ -1161,7 +1162,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label22: TLabel Left = 307 Top = 312 - Width = 40 + Width = 36 Height = 44 Caption = #20132#29677#13#10#20154 Font.Charset = ANSI_CHARSET @@ -1175,7 +1176,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label24: TLabel Left = 470 Top = 326 - Width = 91 + Width = 83 Height = 22 Caption = #20132#29677#36716#25968'1' Font.Charset = ANSI_CHARSET @@ -1216,7 +1217,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object www: TLabel Left = 11 Top = 105 - Width = 68 + Width = 66 Height = 38 Caption = #37325#37327 Font.Charset = ANSI_CHARSET @@ -1243,7 +1244,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label5: TLabel Left = 482 Top = 209 - Width = 40 + Width = 36 Height = 44 Caption = #20132#29677#13#10#20154'2' Font.Charset = ANSI_CHARSET @@ -1257,7 +1258,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label9: TLabel Left = 466 Top = 173 - Width = 91 + Width = 83 Height = 22 Caption = #20132#29677#36716#25968'2' Font.Charset = ANSI_CHARSET @@ -1271,7 +1272,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label14: TLabel Left = 619 Top = 408 - Width = 40 + Width = 36 Height = 23 Caption = #20132#29677 Font.Charset = ANSI_CHARSET @@ -1327,7 +1328,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label38: TLabel Left = 309 Top = 406 - Width = 20 + Width = 18 Height = 88 Caption = #33853#13#10#24067#13#10#26102#13#10#38388 Font.Charset = ANSI_CHARSET @@ -1341,7 +1342,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label39: TLabel Left = 405 Top = 461 - Width = 20 + Width = 18 Height = 22 Caption = #26102 Font.Charset = ANSI_CHARSET @@ -1355,7 +1356,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label40: TLabel Left = 502 Top = 461 - Width = 20 + Width = 18 Height = 22 Caption = #20998 Font.Charset = ANSI_CHARSET @@ -1383,7 +1384,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label43: TLabel Left = 445 Top = 46 - Width = 40 + Width = 36 Height = 23 Caption = #30382#37325 Font.Charset = ANSI_CHARSET @@ -1397,7 +1398,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label45: TLabel Left = 445 Top = 81 - Width = 40 + Width = 36 Height = 22 Caption = #20928#37325 Font.Charset = ANSI_CHARSET @@ -1411,7 +1412,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label29: TLabel Left = 375 Top = 539 - Width = 40 + Width = 36 Height = 22 Caption = #31354#21152 Font.Charset = ANSI_CHARSET @@ -1425,7 +1426,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label46: TLabel Left = 11 Top = 183 - Width = 68 + Width = 66 Height = 38 Caption = #32534#21495 Font.Charset = ANSI_CHARSET @@ -1452,7 +1453,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label47: TLabel Left = 454 Top = 257 - Width = 100 + Width = 90 Height = 22 Caption = #25377#36710#24037#36716#25968 Font.Charset = ANSI_CHARSET @@ -1493,7 +1494,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label55: TLabel Left = 331 Top = 51 - Width = 40 + Width = 36 Height = 23 Caption = #23458#25143 Font.Charset = ANSI_CHARSET @@ -1507,7 +1508,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label56: TLabel Left = 81 Top = 17 - Width = 68 + Width = 66 Height = 38 Caption = #21697#21517 Font.Charset = ANSI_CHARSET @@ -1520,7 +1521,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object lbl2: TLabel Left = 410 Top = 495 - Width = 40 + Width = 36 Height = 22 Caption = #36710#38388 Font.Charset = ANSI_CHARSET @@ -1547,7 +1548,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label36: TLabel Left = 376 Top = 212 - Width = 20 + Width = 18 Height = 46 Caption = #28145#13#10#33394 Font.Charset = ANSI_CHARSET @@ -1561,7 +1562,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label25: TLabel Left = 306 Top = 212 - Width = 20 + Width = 18 Height = 46 Caption = #28418#13#10#30333 Font.Charset = ANSI_CHARSET @@ -1575,7 +1576,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label48: TLabel Left = 441 Top = 212 - Width = 20 + Width = 18 Height = 46 Caption = #27973#13#10#33394 Font.Charset = ANSI_CHARSET @@ -1589,7 +1590,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Label57: TLabel Left = 84 Top = 298 - Width = 120 + Width = 117 Height = 45 Caption = #39564#24067#24037 Font.Charset = ANSI_CHARSET @@ -2343,8 +2344,8 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Panel4: TPanel Left = 587 Top = 81 - Width = 747 - Height = 602 + Width = 755 + Height = 610 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered @@ -2352,7 +2353,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object cxGrid2: TcxGrid Left = 2 Top = 118 - Width = 743 + Width = 751 Height = 164 Align = alTop TabOrder = 0 @@ -2472,8 +2473,8 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object cxGrid3: TcxGrid Left = 2 Top = 282 - Width = 743 - Height = 318 + Width = 751 + Height = 326 Align = alClient TabOrder = 1 object Tv3: TcxGridDBTableView @@ -2555,7 +2556,7 @@ object frmMJManageNewFDJJAP: TfrmMJManageNewFDJJAP object Panel7: TPanel Left = 2 Top = 2 - Width = 743 + Width = 751 Height = 116 Align = alTop BevelInner = bvRaised diff --git a/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.pas b/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.pas index 3613061..62b5847 100644 --- a/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.pas +++ b/坯布生产计划(WeavingSchedule)/U_MJManageNewFDJJAP.pas @@ -10,22 +10,20 @@ uses cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, - MovePanel, IniFiles, Math, cxLookAndFeels, cxLookAndFeelPainters, - 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, - cxNavigator; + MovePanel, IniFiles, Math, cxLookAndFeels, cxLookAndFeelPainters, 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, cxNavigator; {function CommOpen(fhandle:hwnd;sCommName:PAnsiChar; IntTime:integer):integer;stdcall;external 'JCYData.DLL'; function CommClose(sCommName:PAnsiChar):integer;stdcall;external 'JCYData.DLL'; } @@ -757,7 +755,6 @@ begin end; Flogo := Trim(ADOTmp.FieldByName('FormPara1').AsString); // Flogo := 'GY'; - // Edit6.Text := ''; MJMaoZ.Font.Color := clRed; diff --git a/坯布生产计划(WeavingSchedule)/WeavingSchedule.dof b/坯布生产计划(WeavingSchedule)/WeavingSchedule.dof index b909b0b..b989d03 100644 --- a/坯布生产计划(WeavingSchedule)/WeavingSchedule.dof +++ b/坯布生产计划(WeavingSchedule)/WeavingSchedule.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\\ƻ(WeavingSchedule)\testDll.exe +HostApplication=E:\Ŀ\01_֯\֯\D7zzHanglin\ƻ(WeavingSchedule)\testDll.exe Launcher= UseLauncher=0 DebugCWD=