diff --git a/合同管理(ContractManagement.dll)/ContractManagement.dof b/合同管理(ContractManagement.dll)/ContractManagement.dof index fb880e0..eda4adb 100644 --- a/合同管理(ContractManagement.dll)/ContractManagement.dof +++ b/合同管理(ContractManagement.dll)/ContractManagement.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\D7szChenfeng\ͬ(ContractManagement.dll)\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7szChenfeng\ͬ(ContractManagement.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/合同管理(ContractManagement.dll)/ContractManagement.skincfg b/合同管理(ContractManagement.dll)/ContractManagement.skincfg index 554ddb0..89edbfe 100644 --- a/合同管理(ContractManagement.dll)/ContractManagement.skincfg +++ b/合同管理(ContractManagement.dll)/ContractManagement.skincfg @@ -1,7 +1,7 @@ [ExpressSkins] Default=1 ShowNotifications=1 -Enabled=0 +Enabled=1 dxSkinBlack=1 dxSkinBlue=1 dxSkinBlueprint=1 diff --git a/合同管理(ContractManagement.dll)/U_ContractListNX.dfm b/合同管理(ContractManagement.dll)/U_ContractListNX.dfm index 6167fa7..040dfca 100644 --- a/合同管理(ContractManagement.dll)/U_ContractListNX.dfm +++ b/合同管理(ContractManagement.dll)/U_ContractListNX.dfm @@ -1,6 +1,6 @@ object frmContractListNX: TfrmContractListNX - Left = 382 - Top = 287 + Left = 267 + Top = 202 Width = 1381 Height = 716 Caption = #38144#21806#21512#21516 @@ -20,7 +20,7 @@ object frmContractListNX: TfrmContractListNX object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1373 + Width = 1365 Height = 62 AutoSize = True ButtonHeight = 30 @@ -205,7 +205,7 @@ object frmContractListNX: TfrmContractListNX object cxGrid1: TcxGrid Left = 0 Top = 139 - Width = 1373 + Width = 1365 Height = 362 Align = alTop TabOrder = 3 @@ -462,7 +462,7 @@ object frmContractListNX: TfrmContractListNX object Panel1: TPanel Left = 0 Top = 62 - Width = 1373 + Width = 1365 Height = 43 Align = alTop BevelInner = bvRaised @@ -689,7 +689,7 @@ object frmContractListNX: TfrmContractListNX object cxTabControl1: TcxTabControl Left = 0 Top = 105 - Width = 1373 + Width = 1365 Height = 34 Align = alTop Font.Charset = GB2312_CHARSET @@ -710,14 +710,14 @@ object frmContractListNX: TfrmContractListNX #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 34 - ClientRectRight = 1373 + ClientRectRight = 1365 ClientRectTop = 26 end object cxGrid2: TcxGrid Left = 0 Top = 509 - Width = 1373 - Height = 176 + Width = 1365 + Height = 168 Align = alClient TabOrder = 4 object Tv2: TcxGridDBTableView @@ -1048,7 +1048,7 @@ object frmContractListNX: TfrmContractListNX object cxSplitter2: TcxSplitter Left = 0 Top = 501 - Width = 1373 + Width = 1365 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salTop diff --git a/合同管理(ContractManagement.dll)/U_ContractListNX.pas b/合同管理(ContractManagement.dll)/U_ContractListNX.pas index fb7c357..1b8afb6 100644 --- a/合同管理(ContractManagement.dll)/U_ContractListNX.pas +++ b/合同管理(ContractManagement.dll)/U_ContractListNX.pas @@ -519,7 +519,7 @@ begin sql.Add(',Telephone=( select TOP 1 Telephone from BS_Company_Sub X inner join BS_Company_Main Y on X.CoID=Y.CoID where Y.CoType=''ͻ'' and Y.Valid=''Y'' and Y.Code= A.buyno) '); sql.Add(' from Contract_Main A inner join Contract_Sub B on A.ConMainId=B.ConMainId '); sql.Add(' where A.ConMainId=''' + Trim(CDS_Main.fieldbyname('ConMainId').AsString) + ''''); - sql.Add(' order by B.XHNo '); + sql.Add(' order by cast(B.XHNo as int) '); //ShowMessage(SQL.Text); Open; end; diff --git a/合同管理(ContractManagement.dll)/U_GetDllForm.pas b/合同管理(ContractManagement.dll)/U_GetDllForm.pas index f229c84..9efb271 100644 --- a/合同管理(ContractManagement.dll)/U_GetDllForm.pas +++ b/合同管理(ContractManagement.dll)/U_GetDllForm.pas @@ -74,6 +74,12 @@ begin dtbase := 'chenfengdata'; user := 'rtsa'; pswd := 'rightsoft@5740'; +// +// server := '127.0.0.1'; +// dtbase := 'delphichenfeng'; +// user := 'sa'; +// pswd := 'rightsoft'; + DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DName:='ADMIN'; // DParameters1:='Ȩ'; diff --git a/合同管理(ContractManagement.dll)/U_testdll.dfm b/合同管理(ContractManagement.dll)/U_testdll.dfm index 6b709b8..924be21 100644 --- a/合同管理(ContractManagement.dll)/U_testdll.dfm +++ b/合同管理(ContractManagement.dll)/U_testdll.dfm @@ -1,6 +1,6 @@ object Form1: TForm1 - Left = 203 - Top = 121 + Left = 240 + Top = 237 Width = 791 Height = 554 Caption = 'Form1' diff --git a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg index 7d64d03..fd6b1a5 100644 --- a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg +++ b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg @@ -9,9 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = +PROJECTS = FabricInspection.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ +FabricInspection.dll: FabricInspection.dpr + $(DCC) + +testDll.exe: testDll.dpr + $(DCC) + diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm index 6f47611..83f8d6f 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm @@ -19,7 +19,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1454 + Width = 1446 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -57,7 +57,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai object Panel1: TPanel Left = 0 Top = 32 - Width = 1454 + Width = 1446 Height = 58 Align = alTop BevelInner = bvRaised @@ -309,7 +309,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai Left = 689 Top = 90 Width = 231 - Height = 598 + Height = 590 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -462,7 +462,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai Left = 0 Top = 90 Width = 689 - Height = 598 + Height = 590 Align = alLeft TabOrder = 2 object Tv3: TcxGridDBTableView @@ -611,8 +611,8 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai object cxGrid2: TcxGrid Left = 920 Top = 90 - Width = 534 - Height = 598 + Width = 526 + Height = 590 Align = alClient TabOrder = 4 object Tv2: TcxGridDBTableView diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas index f799242..3166ce1 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas @@ -11,7 +11,21 @@ uses cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, BtnEdit, RM_BarCode, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxCore, ActiveX, dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter; + dxCore, ActiveX, 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 TfrmClothSCDCGAnPai = class(TForm) diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm index 8f55e24..300fd22 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm @@ -1,6 +1,6 @@ object frmGreyInspection: TfrmGreyInspection - Left = 192 - Top = 41 + Left = 216 + Top = 74 Width = 1316 Height = 755 Caption = #26797#32455#22383#24067#26816#39564 @@ -22,7 +22,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 0 Top = 85 Width = 217 - Height = 639 + Height = 631 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -764,7 +764,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 217 Top = 85 Width = 296 - Height = 639 + Height = 631 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -773,7 +773,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 2 Top = 113 Width = 292 - Height = 524 + Height = 516 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clBlue @@ -893,14 +893,14 @@ object frmGreyInspection: TfrmGreyInspection object Panel5: TPanel Left = 0 Top = 0 - Width = 1308 + Width = 1300 Height = 85 Align = alTop TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1306 + Width = 1298 Height = 53 Align = alClient BevelInner = bvRaised @@ -1055,7 +1055,7 @@ object frmGreyInspection: TfrmGreyInspection object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1306 + Width = 1298 Height = 30 ButtonHeight = 30 ButtonWidth = 95 @@ -1144,8 +1144,8 @@ object frmGreyInspection: TfrmGreyInspection object cxGrid3: TcxGrid Left = 513 Top = 85 - Width = 795 - Height = 639 + Width = 787 + Height = 631 Align = alClient TabOrder = 3 object Tv3: TcxGridDBTableView diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas index 4f466c1..4ebd964 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas @@ -1315,6 +1315,8 @@ begin FieldByName('Person1').Value := trim(Person1.Text); FieldByName('Person2').Value := trim(Person2.Text); FieldByName('Person3').Value := trim(Person3.Text); + FieldByName('Person4').Value := trim(Person4.Text); + FieldByName('Person5').Value := trim(Person5.Text); FieldByName('group1').Value := trim(Person1.hint); FieldByName('group2').Value := trim(Person2.hint); @@ -1322,8 +1324,6 @@ begin FieldByName('group4').Value := trim(Person4.hint); FieldByName('group5').Value := trim(Person5.hint); - FieldByName('Person4').Value := trim(Person4.Text); - FieldByName('Person5').Value := trim(Person5.Text); // FieldByName('JYLen1').Value := StrToFloatdef(trim(JYLen1.Text), 0); FieldByName('JYLen2').Value := StrToFloatdef(trim(JYLen2.Text), 0); @@ -1470,6 +1470,7 @@ var fPrintFile: string; mvalue: Double; i: Integer; + Result: Boolean; begin BTPrint.Enabled := False; Scan.SetFocus; @@ -1485,6 +1486,9 @@ begin BTPrint.Enabled := True; exit; end; + + + if FAPID = '' then begin with ADOCmd do @@ -1492,7 +1496,6 @@ begin close; sql.Clear; 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; if ADOCmd.FieldByName('YJPS').AsFloat >= ADOCmd.FieldByName('c_pie').AsFloat then @@ -1502,10 +1505,11 @@ begin BTPrint.Enabled := True; Exit; end; - end; end; + + if SaveData() then begin if StrToFloatDef(kaijian.Text, 0) <> 0 then @@ -2288,41 +2292,71 @@ end; procedure TfrmGreyInspection.JYLen1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if Trim(person1.Text) = '' then + if Button = mbLeft then begin - raise Exception.Create('뵲1!'); + if Trim(person1.Text) = '' then + begin + Application.MessageBox('뵲1', 'ʾ', MB_OK + MB_ICONWARNING); + if Person1.CanFocus then + Person1.SetFocus; + Abort; + end; end; end; procedure TfrmGreyInspection.JYLen2MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if Trim(person2.Text) = '' then + if Button = mbLeft then begin - raise Exception.Create('뵲2!'); + if Trim(person2.Text) = '' then + begin + Application.MessageBox('뵲2', 'ʾ', MB_OK + MB_ICONWARNING); + if Person2.CanFocus then + Person2.SetFocus; + Abort; + end; end; end; procedure TfrmGreyInspection.JYLen3MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if Trim(person3.Text) = '' then + if Button = mbLeft then begin - raise Exception.Create('뵲3!'); + if Trim(person3.Text) = '' then + begin + Application.MessageBox('뵲3', 'ʾ', MB_OK + MB_ICONWARNING); + if Person3.CanFocus then + Person3.SetFocus; + Abort; + end; end; end; procedure TfrmGreyInspection.JYLen4MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if Trim(person4.Text) = '' then + if Button = mbLeft then begin - raise Exception.Create('뵲4!'); + if Trim(person4.Text) = '' then + begin + Application.MessageBox('뵲1', 'ʾ', MB_OK + MB_ICONWARNING); + if Person4.CanFocus then + Person4.SetFocus; + Abort; + end; end; end; procedure TfrmGreyInspection.JYLen5MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if Trim(person5.Text) = '' then + if Button = mbLeft then begin - raise Exception.Create('뵲5!'); + if Trim(person5.Text) = '' then + begin + Application.MessageBox('뵲5', 'ʾ', MB_OK + MB_ICONWARNING); + if Person5.CanFocus then + Person5.SetFocus; + Abort; + end; end; end; diff --git a/布匹检验(FabricInspection.dll)/U_testdll.dfm b/布匹检验(FabricInspection.dll)/U_testdll.dfm index 412f933..9189b64 100644 --- a/布匹检验(FabricInspection.dll)/U_testdll.dfm +++ b/布匹检验(FabricInspection.dll)/U_testdll.dfm @@ -1,6 +1,6 @@ object Form1: TForm1 - Left = 155 - Top = 182 + Left = 480 + Top = 300 Width = 791 Height = 554 Caption = 'Form1' diff --git a/布匹检验(FabricInspection.dll)/testDll.dof b/布匹检验(FabricInspection.dll)/testDll.dof index d454d72..b1be23e 100644 --- a/布匹检验(FabricInspection.dll)/testDll.dof +++ b/布匹检验(FabricInspection.dll)/testDll.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\selfware_83398\selfware\ֿ\Ŀ\self\뵥DDMD.dll)\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7szChenfeng\ƥ(FabricInspection.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm index 5f1f263..c452232 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm @@ -1,8 +1,8 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut - Left = 192 - Top = 232 + Left = 466 + Top = 165 Width = 1075 - Height = 664 + Height = 665 Caption = #21457#36135#30003#35831#24405#20837 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -18,7 +18,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1067 + Width = 1059 Height = 29 ButtonHeight = 30 ButtonWidth = 59 @@ -58,7 +58,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1067 + Width = 1059 Height = 104 Align = alTop BevelInner = bvNone @@ -349,7 +349,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object ToolBar2: TToolBar Left = 0 Top = 133 - Width = 1067 + Width = 1059 Height = 29 ButtonHeight = 30 ButtonWidth = 59 @@ -389,8 +389,8 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut object cxGrid1: TcxGrid Left = 0 Top = 162 - Width = 1067 - Height = 471 + Width = 1059 + Height = 464 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm index 4e163bf..aef9c73 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.dfm @@ -1,6 +1,6 @@ object frmCPFHSQList: TfrmCPFHSQList - Left = 74 - Top = 188 + Left = 132 + Top = 57 Width = 1308 Height = 679 Caption = #25104#21697#21457#36135#30003#35831 @@ -19,10 +19,11 @@ object frmCPFHSQList: TfrmCPFHSQList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1300 + Width = 1292 + Height = 20 AutoSize = True - ButtonHeight = 30 - ButtonWidth = 95 + ButtonHeight = 18 + ButtonWidth = 72 Caption = 'ToolBar1' Color = clSkyBlue Flat = True @@ -31,7 +32,6 @@ object frmCPFHSQList: TfrmCPFHSQList Font.Height = -12 Font.Name = #23435#20307 Font.Style = [] - Images = DataLink_FinishedClothWarehouse.ThreeImgList List = True ParentColor = False ParentFont = False @@ -46,7 +46,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBRafreshClick end object TBFind: TToolButton - Left = 63 + Left = 40 Top = 0 AutoSize = True Caption = #36807#28388 @@ -54,7 +54,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBFindClick end object TBAdd: TToolButton - Left = 126 + Left = 80 Top = 0 AutoSize = True Caption = #26032#22686'('#26126#32454')' @@ -63,7 +63,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBAddClick end object ToolButton4: TToolButton - Left = 225 + Left = 156 Top = 0 AutoSize = True Caption = #26032#22686'('#27719#24635')' @@ -71,7 +71,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = ToolButton4Click end object TBEdit: TToolButton - Left = 324 + Left = 232 Top = 0 AutoSize = True Caption = #20462#25913 @@ -79,7 +79,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBEditClick end object ToolButton1: TToolButton - Left = 387 + Left = 272 Top = 0 AutoSize = True Caption = #26597#30475 @@ -87,7 +87,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = ToolButton1Click end object TBDel: TToolButton - Left = 450 + Left = 312 Top = 0 AutoSize = True Caption = #21024#38500 @@ -95,7 +95,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBDelClick end object tchk: TToolButton - Left = 513 + Left = 352 Top = 0 AutoSize = True Caption = #23457#26680 @@ -103,7 +103,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = tchkClick end object Tnochk: TToolButton - Left = 576 + Left = 392 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -111,7 +111,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TnochkClick end object ToolButton2: TToolButton - Left = 663 + Left = 456 Top = 0 AutoSize = True Caption = #24050#23436#25104 @@ -119,7 +119,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = ToolButton2Click end object ToolButton3: TToolButton - Left = 738 + Left = 508 Top = 0 AutoSize = True Caption = #25764#38144#23436#25104 @@ -127,7 +127,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = ToolButton3Click end object TBPrint: TToolButton - Left = 825 + Left = 572 Top = 0 AutoSize = True Caption = #25171#21360 @@ -135,7 +135,7 @@ object frmCPFHSQList: TfrmCPFHSQList OnClick = TBPrintClick end object TBClose: TToolButton - Left = 888 + Left = 612 Top = 0 AutoSize = True Caption = #20851#38381 @@ -145,9 +145,9 @@ object frmCPFHSQList: TfrmCPFHSQList end object cxGrid1: TcxGrid Left = 0 - Top = 97 - Width = 1300 - Height = 293 + Top = 85 + Width = 1292 + Height = 297 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView @@ -251,10 +251,6 @@ object frmCPFHSQList: TfrmCPFHSQList OptionsView.GroupByBox = False OptionsView.GroupFooters = gfAlwaysVisible OptionsView.Indicator = True - Styles.Inactive = DataLink_FinishedClothWarehouse.SHuangSe - Styles.IncSearch = DataLink_FinishedClothWarehouse.SHuangSe - Styles.Selection = DataLink_FinishedClothWarehouse.SHuangSe - Styles.Header = DataLink_FinishedClothWarehouse.Default object v1Column4: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' @@ -307,7 +303,6 @@ object frmCPFHSQList: TfrmCPFHSQList HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False - Styles.Header = DataLink_FinishedClothWarehouse.Default Width = 74 end object Tv1Column1: TcxGridDBColumn @@ -337,7 +332,6 @@ object frmCPFHSQList: TfrmCPFHSQList HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False - Styles.Header = DataLink_FinishedClothWarehouse.Default Width = 99 end object v1Column2: TcxGridDBColumn @@ -421,8 +415,8 @@ object frmCPFHSQList: TfrmCPFHSQList end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1300 + Top = 20 + Width = 1292 Height = 43 Align = alTop BevelInner = bvRaised @@ -653,8 +647,8 @@ object frmCPFHSQList: TfrmCPFHSQList end object cxTabControl1: TcxTabControl Left = 0 - Top = 75 - Width = 1300 + Top = 63 + Width = 1292 Height = 22 Align = alTop TabOrder = 2 @@ -668,13 +662,13 @@ object frmCPFHSQList: TfrmCPFHSQList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1300 + ClientRectRight = 1292 ClientRectTop = 19 end object cxSplitter1: TcxSplitter Left = 0 - Top = 390 - Width = 1300 + Top = 382 + Width = 1292 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -682,8 +676,8 @@ object frmCPFHSQList: TfrmCPFHSQList end object cxGrid2: TcxGrid Left = 0 - Top = 398 - Width = 1300 + Top = 390 + Width = 1292 Height = 250 Align = alBottom TabOrder = 5 @@ -745,10 +739,6 @@ object frmCPFHSQList: TfrmCPFHSQList OptionsView.Footer = True OptionsView.GroupByBox = False OptionsView.GroupFooters = gfAlwaysVisible - Styles.Inactive = DataLink_FinishedClothWarehouse.SHuangSe - Styles.IncSearch = DataLink_FinishedClothWarehouse.SHuangSe - Styles.Selection = DataLink_FinishedClothWarehouse.SHuangSe - Styles.Header = DataLink_FinishedClothWarehouse.Default object v2Column8: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'P_Code' @@ -765,7 +755,6 @@ object frmCPFHSQList: TfrmCPFHSQList Caption = #30003#35831#21305#25968 DataBinding.FieldName = 'SQPiQty' HeaderAlignmentHorz = taCenter - Styles.Header = DataLink_FinishedClothWarehouse.handBlack Width = 71 end object v2Column1: TcxGridDBColumn @@ -798,20 +787,17 @@ object frmCPFHSQList: TfrmCPFHSQList Top = 184 end object ADOQueryCmd: TADOQuery - Connection = DataLink_FinishedClothWarehouse.ADOLink Parameters = <> Left = 504 Top = 184 end object ADOQueryMain: TADOQuery - Connection = DataLink_FinishedClothWarehouse.ADOLink LockType = ltReadOnly Parameters = <> Left = 640 Top = 176 end object ADOQueryTemp: TADOQuery - Connection = DataLink_FinishedClothWarehouse.ADOLink LockType = ltReadOnly Parameters = <> Left = 704 @@ -849,7 +835,6 @@ object frmCPFHSQList: TfrmCPFHSQList Top = 184 end object ADOQueryPrint: TADOQuery - Connection = DataLink_FinishedClothWarehouse.ADOLink LockType = ltReadOnly Parameters = <> Left = 280 @@ -862,7 +847,6 @@ object frmCPFHSQList: TfrmCPFHSQList Top = 200 end object ADOQuerySub: TADOQuery - Connection = DataLink_FinishedClothWarehouse.ADOLink Parameters = <> Left = 740 Top = 176 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm index e1cb6a5..94a9e2a 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.dfm @@ -1,6 +1,6 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList - Left = 481 - Top = 439 + Left = 486 + Top = 565 Width = 1377 Height = 581 Caption = #26797#32455#32455#36896#21333 @@ -33,7 +33,7 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1369 + Width = 1361 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -117,7 +117,7 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList end object ComboBox1: TComboBox Left = 504 - Top = 3 + Top = 0 Width = 145 Height = 24 Style = csDropDownList @@ -165,7 +165,7 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList object Panel1: TPanel Left = 0 Top = 32 - Width = 1369 + Width = 1361 Height = 73 Align = alTop BevelInner = bvRaised @@ -318,7 +318,7 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList object cxTabControl1: TcxTabControl Left = 0 Top = 105 - Width = 1369 + Width = 1361 Height = 22 Align = alTop TabOrder = 2 @@ -330,14 +330,14 @@ object frmShuttleClothGYList: TfrmShuttleClothGYList #24050#21024#38500#25968#25454) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1369 + ClientRectRight = 1361 ClientRectTop = 19 end object cxGrid4: TcxGrid Left = 0 Top = 127 - Width = 1369 - Height = 423 + Width = 1361 + Height = 415 Align = alClient TabOrder = 3 object Tv3: TcxGridDBTableView diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas index e969c3b..f9052ca 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYList.pas @@ -11,7 +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, cxCheckBox; + dxBarBuiltInMenu, cxPC, cxCheckBox, 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 TfrmShuttleClothGYList = class(TForm) @@ -319,7 +332,8 @@ procedure TfrmShuttleClothGYList.InitForm(); begin InitButton(); ReadCxGrid(Trim(self.Caption), Tv3, ''); - BegDate.DateTime := SGetServerDate10(ADOQueryTemp) - 90; + //BegDate.DateTime := SGetServerDate10(ADOQueryTemp) - 90; + BegDate.DateTime := StrToDate('2024-01-01'); EndDate.DateTime := SGetServerDate10(ADOQueryTemp); InitGrid(); end; diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm index 3d9d808..1b275fb 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.dfm @@ -1,6 +1,6 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL - Left = 488 - Top = 489 + Left = 165 + Top = 249 Width = 1377 Height = 581 Caption = #24037#33402#21333#36873#25321 @@ -33,7 +33,7 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1369 + Width = 1361 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -87,7 +87,7 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object Panel1: TPanel Left = 0 Top = 32 - Width = 1369 + Width = 1361 Height = 73 Align = alTop BevelInner = bvRaised @@ -188,8 +188,8 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object cxGrid1: TcxGrid Left = 0 Top = 127 - Width = 1369 - Height = 423 + Width = 1361 + Height = 415 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -395,8 +395,8 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object cxGrid2: TcxGrid Left = 0 Top = 127 - Width = 1369 - Height = 423 + Width = 1361 + Height = 415 Align = alClient TabOrder = 3 object cxGridDBTableView1: TcxGridDBTableView @@ -602,8 +602,8 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object cxGrid3: TcxGrid Left = 0 Top = 127 - Width = 1369 - Height = 423 + Width = 1361 + Height = 415 Align = alClient TabOrder = 4 object cxGridDBTableView2: TcxGridDBTableView @@ -809,8 +809,8 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object cxGrid4: TcxGrid Left = 0 Top = 127 - Width = 1369 - Height = 423 + Width = 1361 + Height = 415 Align = alClient TabOrder = 5 object Tv3: TcxGridDBTableView @@ -982,7 +982,7 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL object cxTabControl1: TcxTabControl Left = 0 Top = 105 - Width = 1369 + Width = 1361 Height = 22 Align = alTop TabOrder = 6 @@ -994,7 +994,7 @@ object frmShuttleClothGYListSEL: TfrmShuttleClothGYListSEL #24050#21024#38500#25968#25454) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1369 + ClientRectRight = 1361 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas index 99df11a..7b8b03d 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothGYListsel.pas @@ -241,7 +241,7 @@ procedure TfrmShuttleClothGYListSEL.InitForm(); begin ReadCxGrid(Trim(self.Caption), Tv1, ''); - BegDate.DateTime := SGetServerDate10(ADOQueryTemp) - 90; + BegDate.DateTime := StrToDate('2024-01-01');; EndDate.DateTime := SGetServerDate10(ADOQueryTemp); InitGrid(); TBFind.Click(); diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm index b895106..93f9343 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm @@ -1,7 +1,7 @@ object frmClothSCInPut: TfrmClothSCInPut - Left = 329 - Top = 86 - Width = 1474 + Left = 193 + Top = 149 + Width = 1464 Height = 760 Align = alClient Caption = #26797#32455#32455#36896#21333#24405#20837 @@ -19,7 +19,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1466 + Width = 1448 Height = 29 ButtonHeight = 30 ButtonWidth = 95 @@ -65,7 +65,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1466 + Width = 1448 Height = 416 Align = alTop BevelInner = bvNone @@ -715,6 +715,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 69 Width = 119 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -791,6 +792,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 65 Width = 119 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -820,6 +822,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 90 Top = 68 BeepOnEnter = False + Enabled = False ParentFont = False Properties.Buttons = < item @@ -844,6 +847,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 71 Width = 118 Height = 20 + Enabled = False TabOrder = 2 OnKeyPress = ConNoKeyPress end @@ -927,6 +931,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 173 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -942,6 +947,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 174 Width = 118 Height = 20 + Enabled = False TabOrder = 18 OnKeyPress = ConNoKeyPress end @@ -951,6 +957,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 205 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -966,6 +973,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 232 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1034,6 +1042,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 264 Width = 482 Height = 121 + Enabled = False TabOrder = 24 end object ZJPiLen: TEdit @@ -1065,6 +1074,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 232 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1089,6 +1099,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 202 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1114,6 +1125,7 @@ object frmClothSCInPut: TfrmClothSCInPut Width = 120 Height = 20 CharCase = ecUpperCase + Enabled = False TabOrder = 31 OnKeyPress = ConNoKeyPress end @@ -1123,6 +1135,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 207 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1138,6 +1151,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 234 Width = 121 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1153,6 +1167,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 207 Width = 118 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1168,6 +1183,7 @@ object frmClothSCInPut: TfrmClothSCInPut Top = 234 Width = 121 Height = 22 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1273,8 +1289,8 @@ object frmClothSCInPut: TfrmClothSCInPut object cxPageControl1: TcxPageControl Left = 0 Top = 474 - Width = 1466 - Height = 255 + Width = 1448 + Height = 247 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1287,8 +1303,8 @@ object frmClothSCInPut: TfrmClothSCInPut Properties.CustomButtons.Buttons = <> Properties.Style = 9 OnChange = cxPageControl1Change - ClientRectBottom = 255 - ClientRectRight = 1466 + ClientRectBottom = 247 + ClientRectRight = 1448 ClientRectTop = 23 object cxTabSheet1: TcxTabSheet Caption = #32463#19997#32452#21512 @@ -1296,8 +1312,8 @@ object frmClothSCInPut: TfrmClothSCInPut object GroupBox1: TGroupBox Left = 980 Top = 0 - Width = 486 - Height = 232 + Width = 468 + Height = 224 Align = alClient Caption = #32463#25490#21015 Font.Charset = GB2312_CHARSET @@ -1311,9 +1327,10 @@ object frmClothSCInPut: TfrmClothSCInPut Tag = 2 Left = 2 Top = 31 - Width = 482 - Height = 199 + Width = 464 + Height = 191 Align = alClient + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -16 @@ -1327,7 +1344,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 0 Top = 0 Width = 980 - Height = 232 + Height = 224 Align = alLeft TabOrder = 1 object TV1: TcxGridDBTableView @@ -1377,6 +1394,7 @@ object frmClothSCInPut: TfrmClothSCInPut Default = True Kind = bkEllipsis end> + Properties.ReadOnly = True Properties.OnButtonClick = cxGridDBColumn2PropertiesButtonClick HeaderAlignmentHorz = taCenter Options.Moving = False @@ -1387,6 +1405,7 @@ object frmClothSCInPut: TfrmClothSCInPut Caption = #20811#25968 DataBinding.FieldName = 'Y_Qty' PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = True Properties.OnEditValueChanged = cxGridDBColumn3PropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 143 @@ -1394,18 +1413,39 @@ object frmClothSCInPut: TfrmClothSCInPut object TV1Column1: TcxGridDBColumn Caption = #25467#24230 DataBinding.FieldName = 'Y_Ndu' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Width = 79 end object TV1Column2: TcxGridDBColumn Caption = #26681#25968 DataBinding.FieldName = 'Y_roots' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Width = 69 end object cxGridDBColumn4: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Y_Note' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Options.Moving = False Options.Sorting = False @@ -1423,10 +1463,11 @@ object frmClothSCInPut: TfrmClothSCInPut object GroupBox2: TGroupBox Left = 980 Top = 0 - Width = 530 - Height = 281 + Width = 468 + Height = 224 Align = alClient Caption = #32428#25490#21015 + Enabled = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -29 @@ -1438,8 +1479,8 @@ object frmClothSCInPut: TfrmClothSCInPut Tag = 2 Left = 2 Top = 31 - Width = 526 - Height = 248 + Width = 464 + Height = 191 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1454,7 +1495,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 0 Top = 0 Width = 980 - Height = 281 + Height = 224 Align = alLeft TabOrder = 1 object TV2: TcxGridDBTableView @@ -1504,6 +1545,7 @@ object frmClothSCInPut: TfrmClothSCInPut Default = True Kind = bkEllipsis end> + Properties.ReadOnly = True Properties.OnButtonClick = cxGridDBColumn6PropertiesButtonClick HeaderAlignmentHorz = taCenter Options.Moving = False @@ -1514,24 +1556,52 @@ object frmClothSCInPut: TfrmClothSCInPut object cxGridDBColumn9: TcxGridDBColumn Caption = #20811#25968 DataBinding.FieldName = 'Y_Qty' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Width = 143 end object TV2Column1: TcxGridDBColumn Caption = #25467#24230 DataBinding.FieldName = 'Y_Ndu' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Width = 100 end object TV2Column2: TcxGridDBColumn Caption = #26681#25968 DataBinding.FieldName = 'Y_roots' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Width = 70 end object cxGridDBColumn10: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Y_Note' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Options.Moving = False Options.Sorting = False @@ -1549,7 +1619,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox2: TScrollBox Left = 0 Top = 0 - Width = 1458 + Width = 1448 Height = 224 Align = alClient TabOrder = 0 @@ -2642,8 +2712,8 @@ object frmClothSCInPut: TfrmClothSCInPut object ScrollBox3: TScrollBox Left = 0 Top = 0 - Width = 1466 - Height = 232 + Width = 1448 + Height = 224 Align = alClient TabOrder = 0 OnMouseWheel = ScrollBox3MouseWheel @@ -2674,7 +2744,7 @@ object frmClothSCInPut: TfrmClothSCInPut Properties.ShowFocusRect = False Style.BorderStyle = ebsSingle TabOrder = 0 - Height = 211 + Height = 203 Width = 481 end object YWBian: TMemo @@ -2682,7 +2752,7 @@ object frmClothSCInPut: TfrmClothSCInPut Left = 701 Top = 0 Width = 794 - Height = 211 + Height = 203 Align = alRight TabOrder = 1 end @@ -2692,7 +2762,7 @@ object frmClothSCInPut: TfrmClothSCInPut object ToolBar2: TToolBar Left = 0 Top = 445 - Width = 1466 + Width = 1448 Height = 29 ButtonHeight = 30 ButtonWidth = 59 diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm index 23e1431..767b7e0 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm @@ -1,6 +1,6 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList - Left = 146 - Top = 172 + Left = 746 + Top = 656 Width = 1377 Height = 579 Caption = #26797#32455#32455#36896#21333 @@ -117,7 +117,7 @@ object frmShuttleClothSCList: TfrmShuttleClothSCList end object ComboBox1: TComboBox Left = 504 - Top = 3 + Top = 0 Width = 145 Height = 24 Style = csDropDownList diff --git a/梭织计划单(ShuttleSchedule.dll)/U_testdll.dfm b/梭织计划单(ShuttleSchedule.dll)/U_testdll.dfm index 6b709b8..e3893bb 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_testdll.dfm +++ b/梭织计划单(ShuttleSchedule.dll)/U_testdll.dfm @@ -1,6 +1,6 @@ object Form1: TForm1 - Left = 203 - Top = 121 + Left = 587 + Top = 348 Width = 791 Height = 554 Caption = 'Form1'