From 5527f83e2aafde0a03c274a4c54504e3bbe8b648 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sun, 28 Sep 2025 13:35:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=BD=B4=E8=AE=A1=E5=88=92=E8=BF=99?= =?UTF-8?q?=E8=BE=B9=E5=8A=A0=E4=B8=80=E4=B8=AA=20=E6=89=B9=E5=8F=B7=20?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E4=B8=8A=E8=BD=B4=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=85=A5=E5=BA=93=EF=BC=8C=E9=AA=8C=E5=B8=83=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E5=92=8C=E5=BA=93=E5=AD=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=8F=91=E8=B4=A7=E9=80=89?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E9=83=BD=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectGroup1.bpg | 6 +- .../U_GreyInspection.dfm | 20 ++--- .../U_GreyInspection.pas | 2 +- .../FinishedClothWarehouse.dof | 2 +- .../U_FinishedClothInspection.dfm | 24 ++++-- .../U_FinishedClothInspection.pas | 1 + .../U_FinishedCloth_ZKCL.dfm | 4 +- .../ShuttleSchedule.skincfg | 2 +- .../U_PlanCardList.dfm | 84 ++++++++++++------- .../U_PlanCardList.pas | 28 +++---- 经轴仓库(Warehouse.dll)/U_GetDllForm.pas | 23 ++--- .../U_WarpRollerCklist.dfm | 18 ++-- .../U_WarpRollerCklist.pas | 5 +- 经轴仓库(Warehouse.dll)/Warehouse.dof | 2 +- 14 files changed, 129 insertions(+), 92 deletions(-) diff --git a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg index 7c050f6..9065282 100644 --- a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg +++ b/布匹检验(FabricInspection.dll)/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 = FinishedClothWarehouse.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +FinishedClothWarehouse.dll: ..\Ʒֿ(FinishedClothWarehouse.dll)\FinishedClothWarehouse.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\Ʒֿ(FinishedClothWarehouse.dll)\testDll.dpr $(DCC) diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm index a0d04e6..9f76cd6 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm @@ -1,6 +1,6 @@ object frmGreyInspection: TfrmGreyInspection - Left = 219 - Top = 12 + Left = 571 + Top = 124 Width = 1316 Height = 753 Caption = #26797#32455#22383#24067#26816#39564 @@ -22,7 +22,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 0 Top = 85 Width = 217 - Height = 629 + Height = 637 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -764,7 +764,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 217 Top = 85 Width = 296 - Height = 629 + Height = 637 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -773,7 +773,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 2 Top = 113 Width = 292 - Height = 514 + Height = 522 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clBlue @@ -893,14 +893,14 @@ object frmGreyInspection: TfrmGreyInspection object Panel5: TPanel Left = 0 Top = 0 - Width = 1300 + Width = 1308 Height = 85 Align = alTop TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1298 + Width = 1306 Height = 53 Align = alClient BevelInner = bvRaised @@ -1055,7 +1055,7 @@ object frmGreyInspection: TfrmGreyInspection object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1298 + Width = 1306 Height = 30 ButtonHeight = 30 ButtonWidth = 95 @@ -1144,8 +1144,8 @@ object frmGreyInspection: TfrmGreyInspection object cxGrid3: TcxGrid Left = 513 Top = 85 - Width = 787 - Height = 629 + Width = 795 + Height = 637 Align = alClient TabOrder = 3 object Tv3: TcxGridDBTableView diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas index 000c28b..d39a058 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas @@ -1490,7 +1490,7 @@ begin begin close; sql.Clear; - sql.Add(' select c_pie,YJPS=ISNULL((SELECT COUNT(*) FROM JY_Cloth F WHERE F.PCID=E.PCID ),0) from pd_plan_card e where e.pcid= ' + QuotedStr(FPCID)); + sql.Add(' select c_pie,edZDFNo,YJPS=ISNULL((SELECT COUNT(*) FROM JY_Cloth F WHERE F.PCID=E.PCID ),0) from pd_plan_card e where e.pcid= ' + QuotedStr(FPCID)); open; end; diff --git a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof index 5a00e51..5b11953 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof +++ b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\·\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe +HostApplication=D:\Ŀ\D7szChenfeng\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm index b6b90fb..53271a2 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm @@ -1,6 +1,6 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection - Left = 144 - Top = 83 + Left = 468 + Top = 339 Width = 1357 Height = 721 Caption = #25104#21697#26816#39564#25253#21578 @@ -84,7 +84,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object ComboBox1: TComboBox Left = 351 Top = 1 - Width = 39 + Width = 98 Height = 27 Style = csDropDownList Font.Charset = GB2312_CHARSET @@ -104,7 +104,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection '4') end object tbPrintRCD: TToolButton - Left = 390 + Left = 449 Top = 0 AutoSize = True Caption = #20837#24211 @@ -112,7 +112,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection OnClick = tbPrintRCDClick end object ToolButton4: TToolButton - Left = 453 + Left = 512 Top = 0 AutoSize = True Caption = #37325#25171#20179#24211#30721#21333 @@ -120,7 +120,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection OnClick = ToolButton4Click end object B1: TToolButton - Left = 564 + Left = 623 Top = 0 AutoSize = True Caption = #25171#30721#26085#24535 @@ -128,7 +128,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection OnClick = B1Click end object ToolButton2: TToolButton - Left = 651 + Left = 710 Top = 0 AutoSize = True Caption = #26816#39564#25253#21578 @@ -136,7 +136,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection OnClick = ToolButton2Click end object TBExport: TToolButton - Left = 738 + Left = 797 Top = 0 AutoSize = True Caption = #23548#20986 @@ -144,7 +144,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection OnClick = TBExportClick end object TBClose: TToolButton - Left = 801 + Left = 860 Top = 0 AutoSize = True Caption = #20851#38381 @@ -617,6 +617,12 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection Options.Editing = False Width = 63 end + object Tv1Column10: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end object Tv1Column3: TcxGridDBColumn Caption = #24067#31080#21367#21495 DataBinding.FieldName = 'apxh' diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas index 90082a4..196ccf1 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas @@ -119,6 +119,7 @@ type cxStyle3: TcxStyle; ToolButton3: TToolButton; Tv1Column3: TcxGridDBColumn; + Tv1Column10: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm index 90be2ad..9024917 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm @@ -1,6 +1,6 @@ object frmFinishedCloth_ZKCL: TfrmFinishedCloth_ZKCL - Left = 154 - Top = 71 + Left = 225 + Top = 318 Width = 1357 Height = 721 Caption = #36724#21345#20135#37327#32479#35745 diff --git a/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg index cf530a5..554ddb0 100644 --- a/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg +++ b/梭织计划单(ShuttleSchedule.dll)/ShuttleSchedule.skincfg @@ -1,5 +1,5 @@ [ExpressSkins] -Default=0 +Default=1 ShowNotifications=1 Enabled=0 dxSkinBlack=1 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm index 618e6b4..1013e62 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm @@ -1,6 +1,6 @@ object frmPlanCardList: TfrmPlanCardList - Left = 149 - Top = 48 + Left = 280 + Top = 296 Width = 1540 Height = 764 Caption = #32463#36724#35745#21010 @@ -19,22 +19,22 @@ object frmPlanCardList: TfrmPlanCardList object Panel2: TPanel Left = 0 Top = 0 - Width = 1524 - Height = 725 + Width = 1532 + Height = 733 Align = alClient TabOrder = 0 object Panel3: TPanel Left = 1 Top = 1 Width = 680 - Height = 723 + Height = 731 Align = alLeft TabOrder = 0 object cxGrid1: TcxGrid Left = 1 Top = 153 Width = 678 - Height = 569 + Height = 577 Align = alClient TabOrder = 0 object Tv1: TcxGridDBTableView @@ -469,16 +469,16 @@ object frmPlanCardList: TfrmPlanCardList object Panel4: TPanel Left = 937 Top = 1 - Width = 586 - Height = 723 + Width = 594 + Height = 731 Align = alClient Caption = 'Panel4' TabOrder = 1 object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 584 - Height = 721 + Width = 592 + Height = 729 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 @@ -664,12 +664,12 @@ object frmPlanCardList: TfrmPlanCardList Left = 681 Top = 1 Width = 256 - Height = 723 + Height = 731 Align = alLeft TabOrder = 2 object Label4: TLabel Left = 48 - Top = 304 + Top = 320 Width = 64 Height = 20 Caption = #21305' '#39069 @@ -682,7 +682,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label8: TLabel Left = 48 - Top = 206 + Top = 231 Width = 64 Height = 20 Caption = #22836' '#32441 @@ -695,7 +695,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label11: TLabel Left = 48 - Top = 255 + Top = 279 Width = 64 Height = 20 Caption = #36724' '#38271 @@ -708,7 +708,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label12: TLabel Left = 48 - Top = 391 + Top = 399 Width = 64 Height = 20 Caption = #19978' '#25490 @@ -721,7 +721,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label13: TLabel Left = 48 - Top = 159 + Top = 185 Width = 64 Height = 20 Caption = #21345' '#21495 @@ -734,7 +734,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label21: TLabel Left = 48 - Top = 349 + Top = 360 Width = 64 Height = 20 Caption = #21305' '#38271 @@ -760,7 +760,7 @@ object frmPlanCardList: TfrmPlanCardList end object Label3: TLabel Left = 49 - Top = 113 + Top = 142 Width = 63 Height = 20 Caption = #25190#32463#24037 @@ -784,10 +784,23 @@ object frmPlanCardList: TfrmPlanCardList Font.Style = [fsBold] ParentFont = False end + object Label14: TLabel + Left = 47 + Top = 55 + Width = 64 + Height = 20 + Caption = #25209' '#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object edtPiE: TEdit Tag = 2 Left = 121 - Top = 301 + Top = 317 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -803,7 +816,7 @@ object frmPlanCardList: TfrmPlanCardList object edtTouWen: TEdit Tag = 2 Left = 121 - Top = 205 + Top = 230 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -818,7 +831,7 @@ object frmPlanCardList: TfrmPlanCardList object edtLen: TEdit Tag = 2 Left = 121 - Top = 253 + Top = 277 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -833,7 +846,7 @@ object frmPlanCardList: TfrmPlanCardList end object Button3: TButton Left = 79 - Top = 524 + Top = 525 Width = 100 Height = 50 Caption = #37325#25171 @@ -849,7 +862,7 @@ object frmPlanCardList: TfrmPlanCardList object APMachineNo: TEdit Tag = 2 Left = 121 - Top = 62 + Top = 97 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -864,7 +877,7 @@ object frmPlanCardList: TfrmPlanCardList end object Button4: TButton Left = 25 - Top = 61 + Top = 92 Width = 87 Height = 34 Caption = #25972#32463#26426#21495 @@ -895,7 +908,7 @@ object frmPlanCardList: TfrmPlanCardList object edtShangP: TEdit Tag = 2 Left = 121 - Top = 388 + Top = 396 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -910,7 +923,7 @@ object frmPlanCardList: TfrmPlanCardList object edtKaNo: TEdit Tag = 2 Left = 121 - Top = 157 + Top = 183 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -955,7 +968,7 @@ object frmPlanCardList: TfrmPlanCardList object ZJPiLen: TEdit Tag = 2 Left = 121 - Top = 348 + Top = 359 Width = 100 Height = 24 Font.Charset = GB2312_CHARSET @@ -987,7 +1000,7 @@ object frmPlanCardList: TfrmPlanCardList object edtQJingG: TEdit Tag = 2 Left = 121 - Top = 109 + Top = 138 Width = 100 Height = 24 Hint = 'edtQJingG/'#25190#32463#24037 @@ -1018,6 +1031,21 @@ object frmPlanCardList: TfrmPlanCardList OnClick = jcfactorynameClick OnKeyPress = P_Code1KeyPress end + object edZDFNo: TEdit + Tag = 2 + Left = 120 + Top = 54 + Width = 100 + Height = 24 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 15 + OnKeyPress = P_Code1KeyPress + end end end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.pas b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.pas index c29011b..122e4d1 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.pas @@ -11,19 +11,7 @@ uses cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, cxPC, Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, - cxContainer, cxMaskEdit, Math, 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; + cxContainer, cxMaskEdit, Math; type TfrmPlanCardList = class(TForm) @@ -153,6 +141,8 @@ type conno: TEdit; Tv1Column10: TcxGridDBColumn; TV2Column6: TcxGridDBColumn; + Label14: TLabel; + edZDFNo: TEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); procedure FormShow(Sender: TObject); @@ -312,7 +302,7 @@ begin begin Close; sql.Clear; - sql.Add('select D.*,A.*,B.*,d.filltime as filltime2 '); + sql.Add('select D.*,A.*,B.*,d.filltime as filltime2'); sql.Add(',P_Code2=(STUFF(( SELECT '','' +convert(VARCHAR, P_Code) FROM PD_Plan_sub e '); sql.Add('inner join PD_Plan_Card_MS f on e.Subid=f.Subid and f.PCID=' + quotedstr(MPCid)); sql.Add('FOR XML PATH('''')), 1, 1, '''') )'); @@ -321,7 +311,7 @@ begin sql.Add(' inner join PD_Plan_Card_MS C on C.Subid=B.Subid '); sql.Add(' inner join PD_Plan_Card D on C.PCID=D.PCID '); sql.Add(' where D.PCID=' + quotedstr(MPCid)); -// ShowMessage(SQL.Text); + //ShowMessage(SQL.Text); Open; end; //+CONVERT(varchar(5),D.FILLTIME,101) @@ -439,6 +429,7 @@ begin FieldByName('C_ShangPai').Value := Trim(edtShangP.Text); FieldByName('APMachineNo').Value := Trim(APMachineNo.Text); FieldByName('edtKaNo').Value := Trim(edtKaNo.Text); + FieldByName('edZDFNo').Value := Trim(edZDFNo.Text); FieldByName('jcfactoryname').Value := Trim(jcfactoryname.Text); FieldByName('Filler').Value := Trim(DName); @@ -1020,7 +1011,7 @@ begin ZJPiLen.Text := Trim(ADOQueryCmd.fieldbyname('ZJPiLen').AsString); edtTouWen.Text := Trim(ADOQueryCmd.fieldbyname('C_TouWen').AsString); jcfactoryname.Text := Trim(ADOQueryCmd.fieldbyname('jcfactoryname').AsString); - + edZDFNo.Text := trim(ADOQueryCmd.fieldbyname('edZDFNo').AsString); end; Next; end; @@ -1082,6 +1073,9 @@ begin sql.Add(' ,Editer=' + quotedstr(Trim(DName))); sql.Add(' ,Edittime=GETDATE()'); + + sql.Add(' ,edZDFNo=' + quotedstr(Trim(edZDFNo.Text))); + sql.Add(' where PCid=' + quotedstr(Trim(FFPCId))); ExecSQL; end; @@ -1104,7 +1098,7 @@ begin APMachineNo.Text := ''; edtKaNo.Text := ''; edtTouWen.Text := ''; - + edZDFNo.Text := ''; edtPiE.Text := ''; edtLen.Text := ''; edtShangP.Text := ''; diff --git a/经轴仓库(Warehouse.dll)/U_GetDllForm.pas b/经轴仓库(Warehouse.dll)/U_GetDllForm.pas index 6843753..022075e 100644 --- a/经轴仓库(Warehouse.dll)/U_GetDllForm.pas +++ b/经轴仓库(Warehouse.dll)/U_GetDllForm.pas @@ -62,21 +62,22 @@ begin SetLength(user, 255); SetLength(pswd, 255); - server := '101.132.143.144,7781'; - dtbase := 'chenfengdata'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; - + if Trim(DataBaseStr) = '' then + begin + server := '101.132.143.144,7781'; + dtbase := 'chenfengdata'; + user := 'rtsa'; + pswd := 'rightsoft@5740'; // server := '.'; // dtbase := 'yiduidata'; // user := 'sa'; // pswd := 'rightsoft'; - - DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := DataBaseStr; - // DName:='ܸ'; - //DParameters1:='Ȩ'; - //DParameters3:='1'; + DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; + end + else + begin + DConString := DataBaseStr; + end; if not ConnData() then begin result := 0; diff --git a/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.dfm b/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.dfm index 22eb86d..fbb3633 100644 --- a/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.dfm +++ b/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.dfm @@ -1,6 +1,6 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist - Left = 234 - Top = 66 + Left = 430 + Top = 298 Width = 1378 Height = 615 Caption = #32463#36724#20986#24211#31649#29702 @@ -20,7 +20,7 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1362 + Width = 1370 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -92,7 +92,7 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist object Panel1: TPanel Left = 0 Top = 32 - Width = 1362 + Width = 1370 Height = 65 Align = alTop BevelInner = bvRaised @@ -294,8 +294,8 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist object cxGrid1: TcxGrid Left = 0 Top = 97 - Width = 1362 - Height = 479 + Width = 1370 + Height = 487 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clBtnShadow @@ -460,6 +460,12 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist HeaderAlignmentHorz = taCenter Width = 68 end + object Tv1Column14: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.pas b/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.pas index 8487e7c..89c59c4 100644 --- a/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.pas +++ b/经轴仓库(Warehouse.dll)/U_WarpRollerCklist.pas @@ -101,6 +101,7 @@ type P_CODE: TEdit; edtKaNo: TEdit; Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormDestroy(Sender: TObject); procedure TBAddClick(Sender: TObject); @@ -149,7 +150,7 @@ begin begin close; sql.Clear; - sql.Add(' select A.* ,edtKaNo,C_TouWen,ZJPiLen,C_ShangPai,C_PiE,C_Len,APMachineNo '); + sql.Add(' select A.* ,edtKaNo,C_TouWen,ZJPiLen,C_ShangPai,C_PiE,C_Len,APMachineNo ,edZDFNo '); SQL.ADD(',CarNo2=(SELECT MACHNO FROM BS_Machine k where k.machid= (SELECT top 1 CARNO FROM CK_YgCl E WHERE E.MJID=A.PCID ANd CLTYPE=''''))'); SQL.Add(',P_CODE=(select TOP 1 P_CODE from PD_Plan_SUB e where e.SUBID=(select TOP 1 SUBID from PD_Plan_Card_MS f where f.pcid=A.pcid))'); SQL.Add(',P_codeNAME=(select TOP 1 P_codeNAME from PD_Plan_SUB e where e.SUBID=(select TOP 1 SUBID from PD_Plan_Card_MS f where f.pcid=A.pcid))'); @@ -158,7 +159,7 @@ begin SQL.Add(' and A.CRTime>=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)))); SQL.Add(' and A.CRTime<' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)))); SQL.Add(' and A.Valid =''Y'' '); - + // ShowMessage(SQL.Text); open; end; SCreateCDS20(adoqueryMain, CDS_Main); diff --git a/经轴仓库(Warehouse.dll)/Warehouse.dof b/经轴仓库(Warehouse.dll)/Warehouse.dof index 5d138b1..ea868fe 100644 --- a/经轴仓库(Warehouse.dll)/Warehouse.dof +++ b/经轴仓库(Warehouse.dll)/Warehouse.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\·\ֿ(Warehouse.dll)\testDll.exe +HostApplication=D:\Ŀ\D7szChenfeng\ֿ(Warehouse.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD=