From 7738aa2a589219c866a6a365fd87bdbb01893821 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 21 Oct 2025 13:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 应收应付/U_FPWSLIST.dfm | 77 ++++++----- 应收应付/U_FPWSLIST.pas | 37 ++++-- 应收应付/U_YFCRMXList.dfm | 18 ++- 应收应付/U_YFCRMXList.pas | 113 ++++++++-------- 应收应付/YSYF.dof | 2 +- 报关管理(BaoGuan.dll)/BaoGuan.dof | 2 +- 报关管理(BaoGuan.dll)/U_BaoGuanList.pas | 15 ++- 报关管理(BaoGuan.dll)/U_CHList.dfm | 22 +++- 报关管理(BaoGuan.dll)/U_CHList.pas | 17 ++- 报关管理(BaoGuan.dll)/U_DataLink.pas | 15 ++- .../DyeingFinishingPlan.dof | 2 +- .../U_GetDllForm.pas | 8 +- .../U_JYOrderCDList.dfm | 48 ++++--- .../U_JYOrderCDList.pas | 16 ++- .../U_MarkingInspection.dfm | 123 +++++++++++------- .../U_MarkingInspection.pas | 7 +- .../U_OrderInPut.pas | 25 +++- .../U_ProductOrderList.dfm | 30 ++--- 样品(YPGL.dll)/ProjectGroup1.bpg | 4 +- 样品(YPGL.dll)/U_CPAddPN.dfm | 12 +- 样品(YPGL.dll)/YPGL.dof | 2 +- 样品(YPGL.dll)/testDll.cfg | 4 +- 样品(YPGL.dll)/testDll.dof | 2 +- 船样仓库(样品&印花)/ProjectGroup1.bpg | 5 +- 船样仓库(样品&印花)/U_GetDllForm.pas | 3 - 船样仓库(样品&印花)/YPCK.dof | 2 +- 26 files changed, 393 insertions(+), 218 deletions(-) diff --git a/应收应付/U_FPWSLIST.dfm b/应收应付/U_FPWSLIST.dfm index e166b82..1ca2ef1 100644 --- a/应收应付/U_FPWSLIST.dfm +++ b/应收应付/U_FPWSLIST.dfm @@ -1,6 +1,6 @@ object frmFPWSCX: TfrmFPWSCX - Left = 124 - Top = 39 + Left = 392 + Top = 50 Width = 1382 Height = 754 Caption = #21457#31080#24453#25910#26597#35810 @@ -21,7 +21,7 @@ object frmFPWSCX: TfrmFPWSCX object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 Height = 31 ButtonHeight = 30 ButtonWidth = 95 @@ -78,7 +78,7 @@ object frmFPWSCX: TfrmFPWSCX object Panel1: TPanel Left = 0 Top = 31 - Width = 1366 + Width = 1374 Height = 70 Align = alTop BevelInner = bvRaised @@ -86,49 +86,42 @@ object frmFPWSCX: TfrmFPWSCX Color = clSkyBlue TabOrder = 1 object Label3: TLabel - Left = 351 + Left = 364 Top = 13 Width = 60 Height = 12 Caption = #22806#38144#21457#31080#21495 end object Label1: TLabel - Left = 522 + Left = 535 Top = 13 Width = 54 Height = 12 Caption = #23458' '#25143 end object Label2: TLabel - Left = 355 + Left = 368 Top = 43 Width = 54 Height = 12 Caption = #24065' '#31181 end - object Label4: TLabel - Left = 11 - Top = 13 - Width = 24 - Height = 12 - Caption = #33337#26399 - end object Label6: TLabel - Left = 26 + Left = 39 Top = 37 Width = 12 Height = 12 Caption = #33267 end object Label5: TLabel - Left = 522 + Left = 535 Top = 45 Width = 54 Height = 12 Caption = #19994' '#21153' '#21592 end object Label7: TLabel - Left = 712 + Left = 725 Top = 13 Width = 48 Height = 12 @@ -148,14 +141,14 @@ object frmFPWSCX: TfrmFPWSCX ParentFont = False end object Label9: TLabel - Left = 716 + Left = 729 Top = 46 Width = 42 Height = 12 Caption = #29366' '#24577 end object Label11: TLabel - Left = 232 + Left = 245 Top = 43 Width = 12 Height = 12 @@ -176,7 +169,7 @@ object frmFPWSCX: TfrmFPWSCX end object SUBWXFPNO: TEdit Tag = 2 - Left = 416 + Left = 429 Top = 9 Width = 100 Height = 20 @@ -184,7 +177,7 @@ object frmFPWSCX: TfrmFPWSCX OnChange = FeeTypeChange end object begdate: TDateTimePicker - Left = 38 + Left = 51 Top = 9 Width = 97 Height = 20 @@ -193,7 +186,7 @@ object frmFPWSCX: TfrmFPWSCX TabOrder = 1 end object Enddate: TDateTimePicker - Left = 38 + Left = 51 Top = 33 Width = 97 Height = 20 @@ -203,7 +196,7 @@ object frmFPWSCX: TfrmFPWSCX end object orderno: TEdit Tag = 2 - Left = 765 + Left = 778 Top = 9 Width = 95 Height = 20 @@ -212,7 +205,7 @@ object frmFPWSCX: TfrmFPWSCX end object SQZT: TComboBox Tag = 2 - Left = 765 + Left = 778 Top = 42 Width = 77 Height = 24 @@ -233,7 +226,7 @@ object frmFPWSCX: TfrmFPWSCX '') end object BEGDATE2: TDateTimePicker - Left = 249 + Left = 262 Top = 9 Width = 97 Height = 20 @@ -242,7 +235,7 @@ object frmFPWSCX: TfrmFPWSCX TabOrder = 5 end object ENDDATE2: TDateTimePicker - Left = 251 + Left = 264 Top = 39 Width = 97 Height = 20 @@ -251,7 +244,7 @@ object frmFPWSCX: TfrmFPWSCX TabOrder = 6 end object CheckBox1: TCheckBox - Left = 147 + Left = 160 Top = 12 Width = 97 Height = 17 @@ -261,7 +254,7 @@ object frmFPWSCX: TfrmFPWSCX end object JSBZ: TComboBox Tag = 2 - Left = 416 + Left = 429 Top = 39 Width = 100 Height = 24 @@ -282,7 +275,7 @@ object frmFPWSCX: TfrmFPWSCX end object khname: TComboBox Tag = 1 - Left = 581 + Left = 594 Top = 9 Width = 120 Height = 24 @@ -303,7 +296,7 @@ object frmFPWSCX: TfrmFPWSCX end object YWY: TComboBox Tag = 2 - Left = 582 + Left = 595 Top = 39 Width = 120 Height = 24 @@ -322,12 +315,21 @@ object frmFPWSCX: TfrmFPWSCX '' '') end + object CheckBox2: TCheckBox + Left = 8 + Top = 12 + Width = 45 + Height = 17 + Caption = #33337#26399 + TabOrder = 11 + OnClick = CheckBox1Click + end end object cxGrid1: TcxGrid Left = 0 Top = 101 - Width = 1366 - Height = 323 + Width = 1374 + Height = 331 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -510,6 +512,13 @@ object frmFPWSCX: TfrmFPWSCX HeaderAlignmentHorz = taCenter Width = 83 end + object Tv1MXOrderNoSummary: TcxGridDBColumn + Caption = #35746#21333#21495#27719#24635 + DataBinding.FieldName = 'MXOrderNoSummary' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 300 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -517,8 +526,8 @@ object frmFPWSCX: TfrmFPWSCX end object cxGrid2: TcxGrid Left = 0 - Top = 424 - Width = 1366 + Top = 432 + Width = 1374 Height = 291 Align = alBottom TabOrder = 3 diff --git a/应收应付/U_FPWSLIST.pas b/应收应付/U_FPWSLIST.pas index cc07746..963a4d7 100644 --- a/应收应付/U_FPWSLIST.pas +++ b/应收应付/U_FPWSLIST.pas @@ -13,7 +13,20 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu, cxDropDownEdit; + dxBarBuiltInMenu, cxDropDownEdit, 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 TfrmFPWSCX = class(TForm) @@ -49,7 +62,6 @@ type Tv1Column6: TcxGridDBColumn; Label1: TLabel; Label2: TLabel; - Label4: TLabel; Label6: TLabel; begdate: TDateTimePicker; Enddate: TDateTimePicker; @@ -87,6 +99,8 @@ type Label10: TLabel; ToolButton1: TToolButton; Tv1Column12: TcxGridDBColumn; + Tv1MXOrderNoSummary: TcxGridDBColumn; + CheckBox2: TCheckBox; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -242,18 +256,23 @@ begin Filtered := False; SQL.Clear; SQL.Add('EXEC P_VIEW_FPDSCX_CS'); - sql.Add(' @begdate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime)))); - sql.Add(',@Enddate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1)))); - if CheckBox1.Checked = True then + + if CheckBox2.Checked = True then begin - sql.Add(',@begdate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate2.DateTime)))); - sql.Add(',@Enddate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate2.DateTime + 1)))); + sql.Add(' @begdate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime)))); + sql.Add(',@Enddate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1)))); end else begin -// sql.Add(',@begdate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate2.DateTime)))); -// sql.Add(',@Enddate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate2.DateTime + 1)))); + sql.Add(' @begdate='''' '); + sql.Add(',@Enddate='''' '); + end; + + if CheckBox1.Checked = True then + begin + sql.Add(',@begdate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate2.DateTime)))); + sql.Add(',@Enddate2=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate2.DateTime + 1)))); end; diff --git a/应收应付/U_YFCRMXList.dfm b/应收应付/U_YFCRMXList.dfm index 572524a..d6bbc29 100644 --- a/应收应付/U_YFCRMXList.dfm +++ b/应收应付/U_YFCRMXList.dfm @@ -1,6 +1,6 @@ object frmYFCRMXList: TfrmYFCRMXList - Left = 234 - Top = 156 + Left = 440 + Top = 544 Width = 1479 Height = 688 Caption = #24212#20184#27454#26126#32454#26597#35810 @@ -248,21 +248,27 @@ object frmYFCRMXList: TfrmYFCRMXList ItemHeight = 12 TabOrder = 9 OnChange = FACTTYPEChange - OnDropDown = FACTTYPEDropDown Items.Strings = ( '' 'KG' 'M' 'Y') end - object KXType: TEdit + object KXType: TComboBox Tag = 2 Left = 783 - Top = 34 + Top = 35 Width = 82 Height = 20 + Style = csDropDownList + ItemHeight = 12 TabOrder = 10 - OnChange = MXOrderNoChange + OnChange = FACTTYPEChange + Items.Strings = ( + '' + 'KG' + 'M' + 'Y') end end object cxGrid1: TcxGrid diff --git a/应收应付/U_YFCRMXList.pas b/应收应付/U_YFCRMXList.pas index cf10934..4b7b719 100644 --- a/应收应付/U_YFCRMXList.pas +++ b/应收应付/U_YFCRMXList.pas @@ -13,20 +13,20 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, Menus, cxLookAndFeels, cxLookAndFeelPainters, - dxBarBuiltInMenu, cxNavigator, DateUtils, 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; + dxBarBuiltInMenu, cxNavigator, DateUtils, 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 TfrmYFCRMXList = class(TForm) @@ -92,7 +92,7 @@ type Label2: TLabel; qtyunit: TComboBox; Label7: TLabel; - KXType: TEdit; + KXType: TComboBox; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -117,6 +117,7 @@ type procedure InitGrid(); procedure SetStatus(); + procedure InitKXType(); public { Public declarations } @@ -154,8 +155,7 @@ begin begin Close; SQL.Clear; -// if ComboBox1.Text = '뵥' then -// begin + SQL.Add('SELECT CRTime , FactoryName,CFFactoryName,status '); sql.Add(',KXType,MXOrderNo,CPCode,CPName,CPSpec,qtyunit,FACTtYPE,MDTIME '); sql.Add(',sum(PS) PS,sum(Qty) Qty,sum(MxMoney) MxMoney,price= case when sum(Qty)>0 then sum(MxMoney)/sum(Qty) else 0 end '); @@ -188,45 +188,11 @@ begin sql.Add(' group by status,CRTime , FactoryName '); sql.Add(',KXType,MXOrderNo,CFFactoryName,CPCode,CPName,CPSpec,qtyunit,FACTtYPE,MDTIME '); -// end -// else -// begin -// SQL.Add('SELECT * FROM ('); -// sql.Add(' select A.CRTime , A.FactoryName,B.CFFactoryName '); -// sql.Add(',status=(case when A.status=''1'' then ''ȷ'' else ''δȷ'' end )'); -// sql.Add(',B.KXType,B.MXOrderNo,B.CPCode,B.CPName,B.CPSpec,B.qtyunit '); -// sql.Add(',sum(B.PS) PS,sum(B.Qty) Qty,sum(B.MxMoney) MxMoney,price= case when sum(B.Qty)>0 then sum(B.MxMoney)/sum(B.Qty) else 0 end '); -// sql.Add(',FACTtYPE=(SELECT TOP 1 FACTTYPE FROM Company C WHERE A.FactoryName=C.CoName and valid=''Y'') '); -//// SQL.Add(',MDTIME=(CASE WHEN KXTYPE=''ջ'' then convert(varchar(10),(SELECT TOP 1 FILLTIME FROM XH_Cloth_DH z WHERE z.DHID=B.YFPZNO),120 ) '); -//// sql.Add(' else convert(varchar(10),(SELECT TOP 1 FILLTIME FROM CK_SXPB_CR T WHERE T.SPID=B.YFPZNO),120)END)'); -// sql.Add(' from YF_Money_CR A'); -// sql.Add(' inner join YF_Money_CR_SUB B on A.yfid=B.yfid '); -// SQL.Add('WHERE 1=1 '); -// sql.Add(' and A.CRType=''ӦǼ'' '); -// -// if cxTabControl1.TabIndex < 2 then -// sql.Add(' and A.status=''' + inttostr(cxTabControl1.TabIndex) + ''' '); -// -// sql.Add(' group by A.status,A.CRTime , A.FactoryName '); -// sql.Add(',B.KXType,B.MXOrderNo,B.CFFactoryName,B.CPCode,B.CPName,B.CPSpec,B.qtyunit '); -//// SQL.Add(',B.YFPZNO'); -// SQL.Add(')AA'); -// if ComboBox1.Text = '뵥' then -// begin -// sql.Add(' where MDTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' '); -// sql.Add(' and MDTime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' '); -// end -// else -// begin -// sql.Add(' where crTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' '); -// sql.Add(' and crTime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' '); -// end; -// end; -// ShowMessage(SQL.Text); Open; end; SCreateCDS20(ADOQueryMain, CDS_hz); SInitCDSData20(ADOQueryMain, CDS_hz); + InitKXType(); finally ADOQueryMain.EnableControls; ToolButton2.Click; @@ -520,5 +486,48 @@ begin InitGrid(); end; +procedure TfrmYFCRMXList.InitKXType(); +begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('SELECT DISTINCT KXType FROM ('); + sql.Add(' select B.KXType'); + sql.Add(' from YF_Money_CR A'); + sql.Add(' inner join YF_Money_CR_SUB B on A.yfid=B.yfid'); + sql.Add(' WHERE 1=1'); + sql.Add(' and A.CRType=''ӦǼ'''); + + if cxTabControl1.TabIndex < 2 then + sql.Add(' and A.status=''' + inttostr(cxTabControl1.TabIndex) + ''''); + + if ComboBox1.Text = '뵥' then + begin + sql.Add(' and (CASE WHEN B.KXTYPE=''ջ'' then convert(varchar(10),(SELECT TOP 1 FILLTIME FROM XH_Cloth_DH z WHERE z.DHID=B.YFPZNO),120)'); + sql.Add(' else convert(varchar(10),(SELECT TOP 1 FILLTIME FROM CK_SXPB_CR T WHERE T.SPID=B.YFPZNO),120)END)'); + sql.Add(' >=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''''); + sql.Add(' and (CASE WHEN B.KXTYPE=''ջ'' then convert(varchar(10),(SELECT TOP 1 FILLTIME FROM XH_Cloth_DH z WHERE z.DHID=B.YFPZNO),120)'); + sql.Add(' else convert(varchar(10),(SELECT TOP 1 FILLTIME FROM CK_SXPB_CR T WHERE T.SPID=B.YFPZNO),120)END)'); + sql.Add(' <''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''''); + end + else + begin + sql.Add(' and A.crTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''''); + sql.Add(' and A.crTime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''''); + end; + + sql.Add(') t WHERE KXType IS NOT NULL ORDER BY KXType'); + Open; + end; + + KXType.Items.Clear; + while not ADOQueryTemp.eof do + begin + KXType.Items.Add(ADOQueryTemp.fieldbyname('KXType').AsString); + ADOQueryTemp.next; + end; +end; + end. diff --git a/应收应付/YSYF.dof b/应收应付/YSYF.dof index db3f216..1acc0e9 100644 --- a/应收应付/YSYF.dof +++ b/应收应付/YSYF.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=E:\Ŀ\06_ó׹˾\\D7myzhenyong\ӦӦ\testDll.exe +HostApplication=D:\Project\D7myzhenyong\ӦӦ\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/报关管理(BaoGuan.dll)/BaoGuan.dof b/报关管理(BaoGuan.dll)/BaoGuan.dof index 9883f96..aa8cd1b 100644 --- a/报关管理(BaoGuan.dll)/BaoGuan.dof +++ b/报关管理(BaoGuan.dll)/BaoGuan.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\ƽ\D7myzhenyong\ع(BaoGuan.dll)\testDll.exe +HostApplication=D:\Project\D7myzhenyong\ع(BaoGuan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/报关管理(BaoGuan.dll)/U_BaoGuanList.pas b/报关管理(BaoGuan.dll)/U_BaoGuanList.pas index 9f04efb..3b67cb0 100644 --- a/报关管理(BaoGuan.dll)/U_BaoGuanList.pas +++ b/报关管理(BaoGuan.dll)/U_BaoGuanList.pas @@ -13,7 +13,20 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, BtnEdit, cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, MovePanel, Registry, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter; + 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; type TfrmBaoGuanList = class(TForm) diff --git a/报关管理(BaoGuan.dll)/U_CHList.dfm b/报关管理(BaoGuan.dll)/U_CHList.dfm index 442819d..41ffcfb 100644 --- a/报关管理(BaoGuan.dll)/U_CHList.dfm +++ b/报关管理(BaoGuan.dll)/U_CHList.dfm @@ -21,7 +21,7 @@ object frmCHList: TfrmCHList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1368 + Width = 1376 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -100,7 +100,7 @@ object frmCHList: TfrmCHList object Panel1: TPanel Left = 0 Top = 32 - Width = 1368 + Width = 1376 Height = 59 Align = alTop BevelInner = bvRaised @@ -259,8 +259,8 @@ object frmCHList: TfrmCHList object cxGrid2: TcxGrid Left = 0 Top = 91 - Width = 1368 - Height = 540 + Width = 1376 + Height = 548 Align = alClient TabOrder = 2 object TV1: TcxGridDBTableView @@ -394,6 +394,20 @@ object frmCHList: TfrmCHList Options.Sorting = False Width = 46 end + object TV1E4JingZ: TcxGridDBColumn + Caption = #20928#37325 + DataBinding.FieldName = 'E4JingZ' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object TV1JS: TcxGridDBColumn + Caption = #20214#25968 + DataBinding.FieldName = 'JS' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object TV1Column15: TcxGridDBColumn Caption = #37329#39069 DataBinding.FieldName = 'C7BGMoney' diff --git a/报关管理(BaoGuan.dll)/U_CHList.pas b/报关管理(BaoGuan.dll)/U_CHList.pas index 234d363..62dfb88 100644 --- a/报关管理(BaoGuan.dll)/U_CHList.pas +++ b/报关管理(BaoGuan.dll)/U_CHList.pas @@ -12,7 +12,20 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, BtnEdit, cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu, MovePanel, cxCalc, Registry; + dxBarBuiltInMenu, MovePanel, cxCalc, Registry, 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 TfrmCHList = class(TForm) @@ -90,6 +103,8 @@ type TV1Column6: TcxGridDBColumn; Label1: TLabel; ywzb: TEdit; + TV1E4JingZ: TcxGridDBColumn; + TV1JS: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/报关管理(BaoGuan.dll)/U_DataLink.pas b/报关管理(BaoGuan.dll)/U_DataLink.pas index 65ea144..fecae4a 100644 --- a/报关管理(BaoGuan.dll)/U_DataLink.pas +++ b/报关管理(BaoGuan.dll)/U_DataLink.pas @@ -5,7 +5,20 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore, - dxSkinsDefaultPainters; + dxSkinsDefaultPainters, 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; var DConString:String; {ȫַ} server, dtbase, user, pswd: String; {ݿӲ} diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof index 75ebb06..334efb6 100644 --- a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof +++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\\Ⱦƻ(DyeingFinishingPlan.dll)\testDll.exe +HostApplication=D:\Project\D7myzhenyong\Ⱦƻ(DyeingFinishingPlan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas index 4a74ee5..a12a937 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas @@ -84,10 +84,10 @@ begin pswd := 'rightsoft@9101'; // pswd := 'rightsoft'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := DataBaseStr; -// DName := 'ADMIN'; -// DCode:='ADMIN'; - //DParameters1 := 'Ȩ'; +// DConString := DataBaseStr; + DName := 'ADMIN'; + DCode:='ADMIN'; + DParameters1 := 'Ȩ'; if not ConnData() then begin result := 0; diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm index bec6741..dea5ee0 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDList: TfrmJYOrderCDList - Left = 124 - Top = 95 + Left = 322 + Top = 134 Width = 1541 Height = 721 Caption = #26816#39564#25253#21578 @@ -21,6 +21,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList Left = 0 Top = 0 Width = 1533 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 143 @@ -104,51 +105,52 @@ object frmJYOrderCDList: TfrmJYOrderCDList AutoSize = True Caption = #20837#24211#24182#25171#21360#20179#24211#30721#21333 ImageIndex = 12 + Wrap = True OnClick = ToolButton8Click end object ToolButton4: TToolButton - Left = 672 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #37325#25171#20179#24211#30721#21333 ImageIndex = 4 OnClick = ToolButton4Click end object ToolButton2: TToolButton - Left = 783 - Top = 0 + Left = 111 + Top = 30 AutoSize = True Caption = #26816#39564#25253#21578 ImageIndex = 4 OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 870 - Top = 0 + Left = 198 + Top = 30 AutoSize = True Caption = #25171#21360#21367#26631#31614 ImageIndex = 4 OnClick = ToolButton1Click end object B1: TToolButton - Left = 969 - Top = 0 + Left = 297 + Top = 30 AutoSize = True Caption = #25171#30721#26085#24535 ImageIndex = 22 OnClick = B1Click end object TBExport: TToolButton - Left = 1056 - Top = 0 + Left = 384 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 68 OnClick = TBExportClick end object ToolButton6: TToolButton - Left = 1119 - Top = 0 + Left = 447 + Top = 30 AutoSize = True Caption = 'ToolButton6' ImageIndex = 22 @@ -156,8 +158,8 @@ object frmJYOrderCDList: TfrmJYOrderCDList OnClick = ToolButton6Click end object TBClose: TToolButton - Left = 1224 - Top = 0 + Left = 552 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 21 @@ -166,7 +168,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList end object Panel1: TPanel Left = 0 - Top = 32 + Top = 62 Width = 1533 Height = 81 Align = alTop @@ -766,9 +768,9 @@ object frmJYOrderCDList: TfrmJYOrderCDList end object cxGrid1: TcxGrid Left = 0 - Top = 166 + Top = 196 Width = 1533 - Height = 472 + Height = 442 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -1244,6 +1246,10 @@ object frmJYOrderCDList: TfrmJYOrderCDList HeaderAlignmentHorz = taCenter Width = 73 end + object Tv1BarCode: TcxGridDBColumn + Caption = #26465#24418#30721 + DataBinding.FieldName = 'BarCode' + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -1469,7 +1475,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList end object Panel6: TPanel Left = 0 - Top = 113 + Top = 143 Width = 1533 Height = 28 Align = alTop @@ -1568,7 +1574,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList end object cxTabControl1: TcxTabControl Left = 0 - Top = 141 + Top = 171 Width = 1533 Height = 25 Align = alTop diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas index 63d78e0..30444c7 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas @@ -13,7 +13,20 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Printers, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter, cxImage; + dxSkinsDefaultPainters, dxSkinscxPCPainter, cxImage, 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 TZintSymbol = packed record @@ -249,6 +262,7 @@ type Button7: TButton; Edit2: TEdit; Tv1Column8: TcxGridDBColumn; + Tv1BarCode: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm index 905a004..58f738c 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm @@ -23,7 +23,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 236 Top = 89 Width = 621 - Height = 697 + Height = 705 Align = alLeft TabOrder = 6 Visible = False @@ -1572,8 +1572,8 @@ object frmMarkingInspection: TfrmMarkingInspection object cxGrid3: TcxGrid Left = 1151 Top = 89 - Width = 372 - Height = 697 + Width = 380 + Height = 705 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -1693,7 +1693,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 0 Top = 89 Width = 236 - Height = 697 + Height = 705 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2282,7 +2282,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 857 Top = 89 Width = 294 - Height = 697 + Height = 705 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2307,7 +2307,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 2 Top = 404 Width = 290 - Height = 291 + Height = 299 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2423,14 +2423,14 @@ object frmMarkingInspection: TfrmMarkingInspection object Panel5: TPanel Left = 0 Top = 0 - Width = 1523 + Width = 1531 Height = 89 Align = alTop TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1521 + Width = 1529 Height = 57 Align = alClient BevelInner = bvRaised @@ -2477,7 +2477,7 @@ object frmMarkingInspection: TfrmMarkingInspection ParentFont = False end object Label13: TLabel - Left = 882 + Left = 949 Top = 31 Width = 137 Height = 20 @@ -2491,7 +2491,7 @@ object frmMarkingInspection: TfrmMarkingInspection Visible = False end object Label14: TLabel - Left = 924 + Left = 991 Top = 7 Width = 95 Height = 20 @@ -2542,6 +2542,19 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Style = [fsBold] ParentFont = False end + object Label25: TLabel + Left = 649 + Top = 16 + Width = 100 + Height = 19 + Caption = #32465#23450#26465#24418#30721 + Font.Charset = GB2312_CHARSET + Font.Color = clRed + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object APID: TEdit Left = 88 Top = 12 @@ -2618,11 +2631,24 @@ object frmMarkingInspection: TfrmMarkingInspection TabOrder = 4 OnClick = edtChenClick end + object BarCode: TEdit + Left = 752 + Top = 12 + Width = 185 + Height = 27 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 5 + end end object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1521 + Width = 1529 Height = 30 ButtonHeight = 30 ButtonWidth = 119 @@ -3175,8 +3201,8 @@ object frmMarkingInspection: TfrmMarkingInspection end end object cxStyleRepository1: TcxStyleRepository - Left = 864 - Top = 4 + Left = 683 + Top = 383 PixelsPerInch = 96 object cxStyle1: TcxStyle AssignedValues = [svColor, svFont] @@ -3200,36 +3226,38 @@ object frmMarkingInspection: TfrmMarkingInspection end object cxGridPopupMenu1: TcxGridPopupMenu PopupMenus = <> - Left = 645 - Top = 46 + Left = 887 + Top = 315 end object DataSource1: TDataSource DataSet = Order_MJ - Left = 672 + Left = 751 + Top = 383 end object Order_MJ: TClientDataSet Aggregates = <> Params = <> - Left = 744 - Top = 176 + Left = 819 + Top = 315 end object ADOQueryMain: TADOQuery Connection = DataLink_DyeingFinishingPlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 744 - Top = 144 + Left = 683 + Top = 247 end object ADOCmd: TADOQuery Connection = DataLink_DyeingFinishingPlan.ADOLink Parameters = <> - Left = 832 - Top = 140 + Left = 615 + Top = 247 end object RMDB_Main: TRMDBDataSet Visible = True DataSet = ADOQueryPrint - Left = 928 + Left = 683 + Top = 451 end object RM2: TRMGridReport ThreadPrepareReport = True @@ -3248,46 +3276,48 @@ object frmMarkingInspection: TfrmMarkingInspection CompressThread = False LaterBuildEvents = True OnlyOwnerDataSet = False - Left = 709 - Top = 42 + Left = 751 + Top = 451 ReportData = {} end object DataSource2: TDataSource DataSet = CDS_MJCD - Left = 696 + Left = 819 + Top = 383 end object CDS_MJCD: TClientDataSet Aggregates = <> Params = <> - Left = 752 + Left = 683 + Top = 315 end object DataSource3: TDataSource DataSet = CDS_MJID - Left = 1000 - Top = 296 + Left = 887 + Top = 383 end object CDS_MJID: TClientDataSet Aggregates = <> Params = <> - Left = 1016 - Top = 312 + Left = 751 + Top = 315 end object Timer1: TTimer Interval = 100 - Left = 944 - Top = 320 + Left = 887 + Top = 451 end object ADOQueryPrint: TADOQuery Connection = DataLink_DyeingFinishingPlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 724 - Top = 4 + Left = 819 + Top = 247 end object cxGridPopupMenu2: TcxGridPopupMenu PopupMenus = <> - Left = 944 - Top = 539 + Left = 615 + Top = 383 end object ADOQueryMainDSC: TADOQuery Connection = DataLink_DyeingFinishingPlan.ADOLink @@ -3313,8 +3343,8 @@ object frmMarkingInspection: TfrmMarkingInspection ' ' 'and isnull(B.AnPaiChkStatus,'#39#39')='#39#23457#26680#36890#36807#39' and A.SCXDFlag=1' '') - Left = 784 - Top = 144 + Left = 751 + Top = 247 end object RM3: TRMGridReport ThreadPrepareReport = True @@ -3333,18 +3363,19 @@ object frmMarkingInspection: TfrmMarkingInspection CompressThread = False LaterBuildEvents = True OnlyOwnerDataSet = False - Left = 804 + Left = 819 + Top = 451 ReportData = {} end object ADOTmp: TADOQuery Connection = DataLink_DyeingFinishingPlan.ADOLink Parameters = <> - Left = 743 - Top = 111 + Left = 887 + Top = 247 end object PopupMenu1: TPopupMenu - Left = 1188 - Top = 424 + Left = 615 + Top = 451 object N1: TMenuItem Caption = #25764#38144#26368#22823#21253 OnClick = N1Click @@ -3353,7 +3384,7 @@ object frmMarkingInspection: TfrmMarkingInspection object CDS_DDB: TClientDataSet Aggregates = <> Params = <> - Left = 748 - Top = 308 + Left = 615 + Top = 315 end end diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas index b4ffd88..3b24d91 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas @@ -327,6 +327,8 @@ type SpeedButton121: TSpeedButton; SpeedButton122: TSpeedButton; SpeedButton123: TSpeedButton; + Label25: TLabel; + BarCode: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -1281,7 +1283,9 @@ begin FieldByName('mjxh').Value := strtointdef(trim(mjxh.Text), 0); FieldByName('MJTypeOther').Value := Trim(Label9.Caption); FieldByName('JYPerson').Value := Trim(JYPerson.Text); - + + + FieldByName('BarCode').Value := Trim(BarCode.Text); // ȥ if TV2.DataController.Summary.FooterSummaryValues[2] <> NULL then begin @@ -1506,6 +1510,7 @@ begin MJFMLen.Text := ''; MJMaoZ.Text := ''; MJQty4.Text := ''; + BarCode.Text := ''; if FCP = 'Ʒ' then begin Edit4.Text := ''; diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas index 28323cd..f80828c 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas @@ -12,7 +12,19 @@ uses cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit, RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, RM_Dataset, Menus, cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCheckBox, - dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter; + 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; type TfrmOrderInPut = class(TForm) @@ -806,7 +818,16 @@ begin end; if ADOTemp.FieldByName('BSBJ').AsString = '1' then begin - Application.MessageBox('˱Ҫ޸ĹȷϺʹã', 'ʾ', 0); + if ADOTemp.FieldByName('xxnote2').AsString <> '' then + begin + Application.MessageBox(PChar(ADOTemp.FieldByName('xxnote2').AsString), 'ʾ', 0); + end + else + begin + Application.MessageBox('˱Ҫ޸ĹȷϺʹã', 'ʾ', 0); + end; + + end; end; diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm index fd9258e..650ddd4 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm @@ -1,6 +1,6 @@ object frmProductOrderList: TfrmProductOrderList - Left = 188 - Top = 71 + Left = 495 + Top = 367 Width = 1363 Height = 801 Caption = #29983#20135#25351#31034#21333 @@ -21,7 +21,7 @@ object frmProductOrderList: TfrmProductOrderList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1347 + Width = 1355 Height = 62 AutoSize = True ButtonHeight = 30 @@ -295,7 +295,7 @@ object frmProductOrderList: TfrmProductOrderList object Panel1: TPanel Left = 0 Top = 62 - Width = 1347 + Width = 1355 Height = 64 Align = alTop BevelInner = bvRaised @@ -702,8 +702,8 @@ object frmProductOrderList: TfrmProductOrderList object cxGrid1: TcxGrid Left = 0 Top = 157 - Width = 1347 - Height = 364 + Width = 1355 + Height = 372 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -1011,8 +1011,8 @@ object frmProductOrderList: TfrmProductOrderList end object cxSplitter1: TcxSplitter Left = 0 - Top = 558 - Width = 1347 + Top = 566 + Width = 1355 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -1020,8 +1020,8 @@ object frmProductOrderList: TfrmProductOrderList end object Panel2: TPanel Left = 0 - Top = 566 - Width = 1347 + Top = 574 + Width = 1355 Height = 196 Align = alBottom BevelOuter = bvNone @@ -1030,7 +1030,7 @@ object frmProductOrderList: TfrmProductOrderList object cxGrid2: TcxGrid Left = 0 Top = 0 - Width = 1347 + Width = 1355 Height = 196 Align = alClient PopupMenu = PopupMenu2 @@ -1869,8 +1869,8 @@ object frmProductOrderList: TfrmProductOrderList end object Panel11: TPanel Left = 0 - Top = 521 - Width = 1347 + Top = 529 + Width = 1355 Height = 37 Align = alBottom TabOrder = 8 @@ -1930,7 +1930,7 @@ object frmProductOrderList: TfrmProductOrderList object Panel12: TPanel Left = 0 Top = 126 - Width = 1347 + Width = 1355 Height = 31 Align = alTop AutoSize = True @@ -1938,7 +1938,7 @@ object frmProductOrderList: TfrmProductOrderList BorderStyle = bsSingle TabOrder = 9 DesignSize = ( - 1343 + 1351 27) object Label30: TLabel Left = 506 diff --git a/样品(YPGL.dll)/ProjectGroup1.bpg b/样品(YPGL.dll)/ProjectGroup1.bpg index 7c050f6..2b413e5 100644 --- a/样品(YPGL.dll)/ProjectGroup1.bpg +++ b/样品(YPGL.dll)/ProjectGroup1.bpg @@ -9,7 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = testDll.exe YPGL.dll #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ @@ -17,7 +17,7 @@ default: $(PROJECTS) testDll.exe: testDll.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +YPGL.dll: YPGL.dpr $(DCC) diff --git a/样品(YPGL.dll)/U_CPAddPN.dfm b/样品(YPGL.dll)/U_CPAddPN.dfm index 49c92ab..1537eab 100644 --- a/样品(YPGL.dll)/U_CPAddPN.dfm +++ b/样品(YPGL.dll)/U_CPAddPN.dfm @@ -324,9 +324,9 @@ object frmCPAddPN: TfrmCPAddPN object Label10: TLabel Left = 278 Top = 416 - Width = 60 + Width = 85 Height = 16 - Caption = #22791#27880'3'#65306 + Caption = #26356#25913#22791#27880#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -617,9 +617,9 @@ object frmCPAddPN: TfrmCPAddPN end object XXNote1: TEdit Tag = 2 - Left = 330 + Left = 354 Top = 376 - Width = 427 + Width = 420 Height = 22 Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -645,9 +645,9 @@ object frmCPAddPN: TfrmCPAddPN end object XXNote2: TEdit Tag = 2 - Left = 331 + Left = 355 Top = 413 - Width = 427 + Width = 420 Height = 22 Font.Charset = GB2312_CHARSET Font.Color = clWindowText diff --git a/样品(YPGL.dll)/YPGL.dof b/样品(YPGL.dll)/YPGL.dof index d3ee5ac..742b328 100644 --- a/样品(YPGL.dll)/YPGL.dof +++ b/样品(YPGL.dll)/YPGL.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\\Ʒ(YPGL.dll)\testDll.exe +HostApplication=D:\Project\D7myzhenyong\Ʒ(YPGL.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/样品(YPGL.dll)/testDll.cfg b/样品(YPGL.dll)/testDll.cfg index 6c57635..e9c1cc1 100644 --- a/样品(YPGL.dll)/testDll.cfg +++ b/样品(YPGL.dll)/testDll.cfg @@ -31,8 +31,8 @@ -M -$M16384,1048576 -K$00400000 --LE"c:\program files\borland\delphi7\Projects\Bpl" --LN"c:\program files\borland\delphi7\Projects\Bpl" +-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" +-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" -w-UNSAFE_TYPE -w-UNSAFE_CODE -w-UNSAFE_CAST diff --git a/样品(YPGL.dll)/testDll.dof b/样品(YPGL.dll)/testDll.dof index 8d38fa0..9bfd6f6 100644 --- a/样品(YPGL.dll)/testDll.dof +++ b/样品(YPGL.dll)/testDll.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=F:\selfware_83398\selfware\ֿ\Ŀ\self\Ʒ\testDll.exe +HostApplication=D:\Project\D7myzhenyong\Ʒ(YPGL.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/船样仓库(样品&印花)/ProjectGroup1.bpg b/船样仓库(样品&印花)/ProjectGroup1.bpg index e6b2914..8139074 100644 --- a/船样仓库(样品&印花)/ProjectGroup1.bpg +++ b/船样仓库(样品&印花)/ProjectGroup1.bpg @@ -9,7 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe +PROJECTS = testDll.exe YPCK.dll #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ @@ -17,4 +17,7 @@ default: $(PROJECTS) testDll.exe: testDll.dpr $(DCC) +YPCK.dll: YPCK.dpr + $(DCC) + diff --git a/船样仓库(样品&印花)/U_GetDllForm.pas b/船样仓库(样品&印花)/U_GetDllForm.pas index d67c987..9787b3b 100644 --- a/船样仓库(样品&印花)/U_GetDllForm.pas +++ b/船样仓库(样品&印花)/U_GetDllForm.pas @@ -72,12 +72,9 @@ begin SetLength(pswd, 255); server := '47.100.130.130,7781'; -// server := '.'; dtbase := 'zhenyongdata'; -// dtbase := 'cszhenyong'; user := 'zhenyongsa'; pswd := 'rightsoft@9101'; -// pswd := 'rightsoft'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; DConString := DataBaseStr; // Parameters1 := 'Ʒֿ'; diff --git a/船样仓库(样品&印花)/YPCK.dof b/船样仓库(样品&印花)/YPCK.dof index f3f82f2..8c25a89 100644 --- a/船样仓库(样品&印花)/YPCK.dof +++ b/船样仓库(样品&印花)/YPCK.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\\ֿ(Ʒ&ӡ)\testDll.exe +HostApplication=D:\Project\D7myzhenyong\ֿ(Ʒ&ӡ)\testDll.exe Launcher= UseLauncher=0 DebugCWD=