From 77dd2183544409cb5f412e538ac9c61c2f29f2e9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 1 Sep 2025 17:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8A=8A=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E7=BB=87?= =?UTF-8?q?=E9=80=A0=E5=8D=95=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShuttleSchedule.dof | 2 +- .../ShuttleSchedule.skincfg | 50 +++++++++++++++++ .../U_ShuttleClothGYInPut.dfm | 36 ++++++++----- .../U_ShuttleClothGYInPut.pas | 11 +++- .../U_ShuttleClothGYList.dfm | 4 +- .../U_ShuttleClothGYList.pas | 16 +----- .../U_ShuttleClothGYListsel.dfm | 4 +- .../U_ShuttleClothGYListsel.pas | 15 +++++- .../U_ShuttleClothSCInPut.dfm | 54 +++++++++---------- .../U_ShuttleClothSCInPut.pas | 21 +++++--- .../U_ShuttleClothSCList.dfm | 28 +++++----- .../U_ShuttleClothSCList.pas | 31 ++++++----- 12 files changed, 175 insertions(+), 97 deletions(-) create mode 100644 梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg diff --git a/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.dof b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.dof index 192d1ad..daf78f2 100644 --- a/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.dof +++ b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=E:\Ŀ\02_֯\·\D7szChenfeng\֯ƻ(ShuttleSchedule.dll)\testDll.exe +HostApplication=D:\Ŀ\D7szChenfeng\֯ƻ(ShuttleSchedule.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg new file mode 100644 index 0000000..cf530a5 --- /dev/null +++ b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=0 +ShowNotifications=1 +Enabled=0 +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/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.dfm index 3995d5f..3243220 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.dfm @@ -1,6 +1,6 @@ object frmClothGYInPut: TfrmClothGYInPut - Left = 693 - Top = 403 + Left = 422 + Top = 341 Width = 1425 Height = 809 Align = alClient @@ -792,7 +792,7 @@ object frmClothGYInPut: TfrmClothGYInPut Font.Style = [fsBold] ParentFont = False TabOrder = 2 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = cxTabSheet4 Properties.CustomButtons.Buttons = <> Properties.Style = 9 OnChange = cxPageControl1Change @@ -1057,8 +1057,8 @@ object frmClothGYInPut: TfrmClothGYInPut object ScrollBox2: TScrollBox Left = 0 Top = 0 - Width = 1407 - Height = 273 + Width = 1417 + Height = 281 Align = alClient TabOrder = 0 object Label11: TLabel @@ -2033,8 +2033,8 @@ object frmClothGYInPut: TfrmClothGYInPut object cxGrid4: TcxGrid Left = 0 Top = 41 - Width = 1409 - Height = 232 + Width = 1417 + Height = 240 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 @@ -2115,7 +2115,7 @@ object frmClothGYInPut: TfrmClothGYInPut object Panel1: TPanel Left = 0 Top = 0 - Width = 1409 + Width = 1417 Height = 41 Align = alTop TabOrder = 1 @@ -2150,8 +2150,8 @@ object frmClothGYInPut: TfrmClothGYInPut object ScrollBox3: TScrollBox Left = 0 Top = 0 - Width = 1409 - Height = 273 + Width = 1417 + Height = 281 Align = alClient TabOrder = 0 OnMouseWheel = ScrollBox3MouseWheel @@ -2255,8 +2255,8 @@ object frmClothGYInPut: TfrmClothGYInPut Connection = DataLink_ShuttleSchedule.ADOLink LockType = ltReadOnly Parameters = <> - Left = 242 - Top = 316 + Left = 266 + Top = 284 end object DS_YarnJX: TDataSource DataSet = CDS_YarnJX @@ -2419,4 +2419,16 @@ object frmClothGYInPut: TfrmClothGYInPut Left = 781 Top = 552 end + object ADOQuery1: TADOQuery + Connection = DataLink_ShuttleSchedule.ADOLink + Parameters = <> + Left = 210 + Top = 312 + end + object ADOQueryCmd2: TADOQuery + Connection = DataLink_ShuttleSchedule.ADOLink + Parameters = <> + Left = 218 + Top = 264 + end end diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.pas index 27a948a..5a4884e 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYInPut.pas @@ -210,6 +210,8 @@ type Label5: TLabel; Label6: TLabel; zjprice: TEdit; + ADOQuery1: TADOQuery; + ADOQueryCmd2: TADOQuery; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -789,6 +791,9 @@ end; function TfrmClothGYInPut.SaveData(): Boolean; var maxno, maxsubno, maxpbno, maxpzno, maxsjno, czmaxno, Qzmaxno: string; + SQLText: string; + UpdateFields: TStringList; + i: Integer; begin try ADOQueryCmd.Connection.BeginTrans; @@ -847,14 +852,15 @@ begin sql.Add('select * from PD_GY_Main where OrderNo=''' + Trim(OrderNo.Text) + ''''); Open; end; + if ADOQueryTemp.RecordCount > 1 then begin ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('յظ!', 'ʾ', 0); Exit; end; - ///////////////////////////////////////////////////////////////// + ///////////////////////////////////ӱ////////////////////////////// if Trim(FSubId) = '' then begin @@ -891,6 +897,7 @@ begin Post; end; ///////////////////////////////////ӱ////////////////////////////// + ///////////////////////////////////˿////////////////////////////// if FRcore = 1 then begin @@ -960,6 +967,7 @@ begin end; end; ///////////////////////////////////˿////////////////////////////// + ///////////////////////////////////γ˿////////////////////////////// with CDS_YarnWX do begin @@ -1159,6 +1167,7 @@ begin Application.MessageBox('ɹ', 'ʾ', 0); ModalResult := 1; + end; end; diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm index bb526b2..e1cb6a5 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm @@ -1,6 +1,6 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList - Left = 528 - Top = 203 + Left = 481 + Top = 439 Width = 1377 Height = 581 Caption = #26797#32455#32455#36896#21333 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas index 1d752a7..e969c3b 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas @@ -11,21 +11,7 @@ uses cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, StrUtils, RM_e_Graphic, RM_e_Jpeg, - dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinscxPCPainter, cxCheckBox, 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, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, - dxSkinXmas2008Blue; + dxBarBuiltInMenu, cxPC, cxCheckBox; type TfrmShuttleClothGYList = class(TForm) diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm index e46bfc7..3d9d808 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm @@ -1,6 +1,6 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL - Left = 147 - Top = 106 + Left = 488 + Top = 489 Width = 1377 Height = 581 Caption = #24037#33402#21333#36873#25321 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas index 3296ec9..99df11a 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas @@ -12,7 +12,20 @@ uses RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, StrUtils, RM_e_Graphic, RM_e_Jpeg, dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinscxPCPainter; + dxSkinscxPCPainter, 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, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue; type TfrmShuttleClothGYListSEL = class(TForm) diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm index 36114fd..9fde2f8 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm @@ -1,6 +1,6 @@ object frmClothSCInPut: TfrmClothSCInPut - Left = 246 - Top = 71 + Left = 497 + Top = 342 Width = 1474 Height = 760 Align = alClient @@ -19,7 +19,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1458 + Width = 1466 Height = 29 ButtonHeight = 30 ButtonWidth = 95 @@ -65,7 +65,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1458 + Width = 1466 Height = 416 Align = alTop BevelInner = bvNone @@ -1273,8 +1273,8 @@ object frmClothSCInPut: TfrmClothSCInPut object cxPageControl1: TcxPageControl Left = 0 Top = 474 - Width = 1458 - Height = 247 + Width = 1466 + Height = 255 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1283,12 +1283,12 @@ object frmClothSCInPut: TfrmClothSCInPut Font.Style = [fsBold] ParentFont = False TabOrder = 2 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = cxTabSheet3 Properties.CustomButtons.Buttons = <> Properties.Style = 9 OnChange = cxPageControl1Change - ClientRectBottom = 247 - ClientRectRight = 1458 + ClientRectBottom = 255 + ClientRectRight = 1466 ClientRectTop = 23 object cxTabSheet1: TcxTabSheet Caption = #32463#19997#32452#21512 @@ -1296,8 +1296,8 @@ object frmClothSCInPut: TfrmClothSCInPut object GroupBox1: TGroupBox Left = 980 Top = 0 - Width = 478 - Height = 224 + Width = 486 + Height = 232 Align = alClient Caption = #32463#25490#21015 Font.Charset = GB2312_CHARSET @@ -1311,8 +1311,8 @@ object frmClothSCInPut: TfrmClothSCInPut Tag = 2 Left = 2 Top = 31 - Width = 474 - Height = 191 + Width = 482 + Height = 199 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1327,7 +1327,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 0 Top = 0 Width = 980 - Height = 224 + Height = 232 Align = alLeft TabOrder = 1 object TV1: TcxGridDBTableView @@ -1423,8 +1423,8 @@ object frmClothSCInPut: TfrmClothSCInPut object GroupBox2: TGroupBox Left = 980 Top = 0 - Width = 530 - Height = 281 + Width = 486 + Height = 232 Align = alClient Caption = #32428#25490#21015 Font.Charset = GB2312_CHARSET @@ -1438,8 +1438,8 @@ object frmClothSCInPut: TfrmClothSCInPut Tag = 2 Left = 2 Top = 31 - Width = 526 - Height = 248 + Width = 482 + Height = 199 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1454,7 +1454,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 0 Top = 0 Width = 980 - Height = 281 + Height = 232 Align = alLeft TabOrder = 1 object TV2: TcxGridDBTableView @@ -1549,8 +1549,8 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox2: TScrollBox Left = 0 Top = 0 - Width = 1458 - Height = 224 + Width = 1466 + Height = 232 Align = alClient TabOrder = 0 object Label11: TLabel @@ -2525,8 +2525,8 @@ object frmClothSCInPut: TfrmClothSCInPut object cxGrid4: TcxGrid Left = 0 Top = 41 - Width = 1458 - Height = 183 + Width = 1466 + Height = 191 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 @@ -2607,7 +2607,7 @@ object frmClothSCInPut: TfrmClothSCInPut object Panel1: TPanel Left = 0 Top = 0 - Width = 1458 + Width = 1466 Height = 41 Align = alTop TabOrder = 1 @@ -2674,7 +2674,7 @@ object frmClothSCInPut: TfrmClothSCInPut Properties.ShowFocusRect = False Style.BorderStyle = ebsSingle TabOrder = 0 - Height = 203 + Height = 211 Width = 481 end object YWBian: TMemo @@ -2682,7 +2682,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 701 Top = 0 Width = 794 - Height = 203 + Height = 211 Align = alRight TabOrder = 1 end @@ -2692,7 +2692,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar2: TToolBar Left = 0 Top = 445 - Width = 1458 + Width = 1466 Height = 29 ButtonHeight = 30 ButtonWidth = 59 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.pas index 4bc65e0..60326bc 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.pas @@ -582,8 +582,8 @@ begin SQL.Clear; sql.Add(' select A.*,B.* from PD_GY_Main A inner join PD_GY_Sub B on A.MainId=B.MainId'); - sql.Add(' where A.MainId=' + Quotedstr(Trim(FGYNO))); - + sql.Add(' where A.ORDERNO=' + Quotedstr(Trim(GYNO.Text))); + //ShowMessage(SQL.Text); Open; end; @@ -621,7 +621,7 @@ begin begin Close; sql.Clear; - sql.Add('select * from PD_GY_QZ where MainId=''' + Trim(FGYNO) + ''''); + sql.Add('select * from PD_GY_QZ A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where ORDERNO=''' + Trim(GYNO.Text) + ''''); Open; end; SCreateCDS20(ADOQueryTemp, CDS_QZ); @@ -632,7 +632,7 @@ begin begin Close; sql.Clear; - sql.Add('select * from PD_GY_Yarn where PYType=''˿'' and MainId=''' + Trim(FGYNO) + ''''); + sql.Add('select * from PD_GY_Yarn A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where PYType=''˿'' and ORDERNO=''' + Trim(GYNO.Text) + ''''); Open; end; SCreateCDS20(ADOQueryTemp, CDS_YarnJX); @@ -646,7 +646,7 @@ begin begin Close; sql.Clear; - sql.Add('select * from PD_GY_Yarn where PYType=''γ˿'' and MainId=''' + Trim(FGYNO) + ''''); + sql.Add('select * from PD_GY_Yarn A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where PYType=''γ˿'' and ORDERNO=''' + Trim(GYNO.Text) + ''''); Open; end; SCreateCDS20(ADOQueryTemp, CDS_YarnWX); @@ -775,9 +775,11 @@ begin sql.Add('select * from PD_Plan_Yarn where PYType=''˿'' and MainId=''' + Trim(FMainId) + ''''); Open; end; + Y_Note_PLJ.Text := Trim(ADOQueryTemp.FieldByName('Y_Note_PL').AsString); + SCreateCDS20(ADOQueryTemp, CDS_YarnJX); SInitCDSData20(ADOQueryTemp, CDS_YarnJX); - Y_Note_PLJ.Text := Trim(ADOQueryTemp.FieldByName('Y_Note_PL').AsString); + if PState = 0 then begin with CDS_YarnJX do @@ -930,6 +932,13 @@ procedure TfrmClothSCInPut.FormShow(Sender: TObject); begin ToolBar2.Visible := False; InitData(); + if PState = 1 then + begin + FGYNO := GYNO.Text; + INITGY(); + end; + + InitImage(); // Y_Note_PLW.SelectAll; // RichEditLineSpacing(Y_Note_PLW, 0); diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm index 439c8de..df73a39 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm @@ -1,6 +1,6 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList - Left = 147 - Top = 106 + Left = 367 + Top = 493 Width = 1377 Height = 579 Caption = #26797#32455#32455#36896#21333 @@ -33,7 +33,7 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1361 + Width = 1369 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -214,7 +214,7 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object Panel1: TPanel Left = 0 Top = 32 - Width = 1361 + Width = 1369 Height = 73 Align = alTop BevelInner = bvRaised @@ -476,8 +476,8 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object cxGrid1: TcxGrid Left = 0 Top = 127 - Width = 1361 - Height = 413 + Width = 1369 + Height = 421 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -683,8 +683,8 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object cxGrid2: TcxGrid Left = 0 Top = 127 - Width = 1361 - Height = 413 + Width = 1369 + Height = 421 Align = alClient TabOrder = 3 object cxGridDBTableView1: TcxGridDBTableView @@ -890,8 +890,8 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object cxGrid3: TcxGrid Left = 0 Top = 127 - Width = 1361 - Height = 413 + Width = 1369 + Height = 421 Align = alClient TabOrder = 4 object cxGridDBTableView2: TcxGridDBTableView @@ -1097,8 +1097,8 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object cxGrid4: TcxGrid Left = 0 Top = 127 - Width = 1361 - Height = 413 + Width = 1369 + Height = 421 Align = alClient TabOrder = 5 object Tv3: TcxGridDBTableView @@ -1403,7 +1403,7 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList object cxTabControl1: TcxTabControl Left = 0 Top = 105 - Width = 1361 + Width = 1369 Height = 22 Align = alTop TabOrder = 6 @@ -1415,7 +1415,7 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList #24050#21024#38500#25968#25454) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1361 + ClientRectRight = 1369 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.pas index c86b1a9..acaf649 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.pas @@ -11,19 +11,20 @@ uses cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, StrUtils, RM_e_Graphic, RM_e_Jpeg, - dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, - dxSkinscxPCPainter, 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, - dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue; + dxBarBuiltInMenu, cxPC, 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 TfrmShuttleClothSCList = class(TForm) @@ -421,7 +422,7 @@ begin end; // if Trim(canshu1) = '¼' then // sql.Add(' and A.Filler=' + quotedstr(DName)); -// ShowMessage(sql.Text); + //ShowMessage(sql.Text); Open; end; @@ -726,8 +727,6 @@ begin FSubId := Trim(Self.Order_Main.fieldbyname('SubId').AsString); FConNo := Trim(Self.Order_Main.fieldbyname('ConNo').AsString); TBSave.Visible := False; - - ScrollBox1.Enabled := False; if ShowModal = 1 then begin