diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index 039a277..f5177ef 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\εֳ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJweimianerfen\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/U_ClothHCList.dfm b/打卷检验管理/U_ClothHCList.dfm index 9977459..bf344a8 100644 --- a/打卷检验管理/U_ClothHCList.dfm +++ b/打卷检验管理/U_ClothHCList.dfm @@ -433,6 +433,18 @@ object frmClothHCList: TfrmClothHCList HeaderAlignmentHorz = taCenter Width = 65 end + object TV2Column1: TcxGridDBColumn + Caption = #25490#21333#26102#38388 + DataBinding.FieldName = 'PDtime' + HeaderAlignmentHorz = taCenter + Width = 60 + end + object TV2Column2: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'XHNO' + HeaderAlignmentHorz = taCenter + Width = 60 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 diff --git a/打卷检验管理/U_ClothHCList.pas b/打卷检验管理/U_ClothHCList.pas index 4767899..e9418f7 100644 --- a/打卷检验管理/U_ClothHCList.pas +++ b/打卷检验管理/U_ClothHCList.pas @@ -6,12 +6,24 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB, - cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, - cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, - cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, - RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, - cxTextEdit, cxDropDownEdit, cxCheckBox, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls, + cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, + cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, + RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxDropDownEdit, + cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 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 TfrmClothHCList = class(TForm) @@ -62,6 +74,8 @@ type V2Column2: TcxGridDBColumn; PRTHX: TEdit; Label5: TLabel; + TV2Column1: TcxGridDBColumn; + TV2Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -73,13 +87,13 @@ type procedure TV2DblClick(Sender: TObject); procedure Button1Click(Sender: TObject); private - FInt,PFInt:Integer; + FInt, PFInt: Integer; procedure InitGrid(); procedure InitForm(); - procedure InitGridWSQL(FWSQL:String); + procedure InitGridWSQL(FWSQL: string); { Private declarations } public - fType:string; + fType: string; { Public declarations } end; @@ -87,26 +101,27 @@ var frmClothHCList: TfrmClothHCList; implementation + uses - U_DataLink,U_ClothContractInPut,U_Fun,U_ProductOrderList,U_ZDYHelp,U_ProductOrderNewList_JD; + U_DataLink, U_ClothContractInPut, U_Fun, U_ProductOrderList, U_ZDYHelp, + U_ProductOrderNewList_JD; {$R *.dfm} procedure TfrmClothHCList.FormDestroy(Sender: TObject); begin - frmClothHCList:=nil; + frmClothHCList := nil; end; -procedure TfrmClothHCList.FormClose(Sender: TObject; - var Action: TCloseAction); +procedure TfrmClothHCList.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmClothHCList.TBCloseClick(Sender: TObject); begin Close; - WriteCxGrid(self.Caption+tv2.Name,Tv2,'ָʾ'); + WriteCxGrid(self.Caption + tv2.Name, Tv2, 'ָʾ'); end; procedure TfrmClothHCList.InitGrid(); @@ -114,41 +129,40 @@ begin try //ADOQueryMain.DisableControls; with ADOQueryMain do - begin - + begin Close; - Filtered:=False; + Filtered := False; sql.Clear; sql.Add('exec P_View_HC :begdate,:enddate,:WSQL'); - Parameters.ParamByName('begdate').Value:=FormatDateTime('yyyy-MM-dd',BegDate.Date); - Parameters.ParamByName('enddate').Value:=FormatDateTime('yyyy-MM-dd',EndDate.Date+1); - Parameters.ParamByName('WSQL').Value:=''; + Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd', BegDate.Date); + Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', EndDate.Date + 1); + Parameters.ParamByName('WSQL').Value := ''; Open; end; - SCreateCDS20(ADOQueryMain,Order_Main); - SInitCDSData20(ADOQueryMain,Order_Main); + SCreateCDS20(ADOQueryMain, Order_Main); + SInitCDSData20(ADOQueryMain, Order_Main); finally //ADOQueryMain.EnableControls; end; end; -procedure TfrmClothHCList.InitGridWSQL(FWSQL:String); +procedure TfrmClothHCList.InitGridWSQL(FWSQL: string); begin try ADOQueryMain.DisableControls; with ADOQueryMain do begin - Filtered:=False; + Filtered := False; Close; sql.Clear; sql.Add('exec P_View_HC :begdate,:enddate,:WSQL'); - Parameters.ParamByName('begdate').Value:='2014-01-01'; - Parameters.ParamByName('enddate').Value:='2050-01-01'; - Parameters.ParamByName('WSQL').Value:=FWSQL; + Parameters.ParamByName('begdate').Value := '2014-01-01'; + Parameters.ParamByName('enddate').Value := '2050-01-01'; + Parameters.ParamByName('WSQL').Value := FWSQL; Open; end; - SCreateCDS20(ADOQueryMain,Order_Main); - SInitCDSData20(ADOQueryMain,Order_Main); + SCreateCDS20(ADOQueryMain, Order_Main); + SInitCDSData20(ADOQueryMain, Order_Main); finally ADOQueryMain.EnableControls; end; @@ -156,22 +170,21 @@ end; procedure TfrmClothHCList.InitForm(); begin - ReadCxGrid(self.Caption+tv2.Name,Tv2,'ָʾ'); - EndDate.DateTime:=SGetServerDateTime(ADOQueryTemp); - BegDate.DateTime:=EndDate.DateTime; + ReadCxGrid(self.Caption + tv2.Name, Tv2, 'ָʾ'); + EndDate.DateTime := SGetServerDateTime(ADOQueryTemp); + BegDate.DateTime := EndDate.DateTime; //InitGrid(); end; procedure TfrmClothHCList.TBFindClick(Sender: TObject); begin - if ADOQueryMain.Active=False then Exit; - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,Order_Main); - SInitCDSData20(ADOQueryMain,Order_Main); + if ADOQueryMain.Active = False then + Exit; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, Order_Main); + SInitCDSData20(ADOQueryMain, Order_Main); end; - - procedure TfrmClothHCList.TBRafreshClick(Sender: TObject); begin InitGrid(); @@ -179,10 +192,11 @@ end; procedure TfrmClothHCList.OrderNoMChange(Sender: TObject); begin - if ADOQueryMain.Active=False then Exit; - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,Order_Main); - SInitCDSData20(ADOQueryMain,Order_Main); + if ADOQueryMain.Active = False then + Exit; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, Order_Main); + SInitCDSData20(ADOQueryMain, Order_Main); end; procedure TfrmClothHCList.FormShow(Sender: TObject); @@ -191,27 +205,30 @@ begin TBRafresh.Click; end; -procedure TfrmClothHCList.OrderNoMKeyPress(Sender: TObject; - var Key: Char); +procedure TfrmClothHCList.OrderNoMKeyPress(Sender: TObject; var Key: Char); var - fsj:String; + fsj: string; begin - if Key=#13 then + if Key = #13 then begin - if Length(Trim(OrderNoM.Text))<4 then Exit; - fsj:=' and B.OrderNo like '''+'%'+Trim(OrderNoM.Text)+'%'+''''; + if Length(Trim(OrderNoM.Text)) < 4 then + Exit; + fsj := ' and B.OrderNo like ''' + '%' + Trim(OrderNoM.Text) + '%' + ''''; InitGridWSQL(fsj); end; end; procedure TfrmClothHCList.TV2DblClick(Sender: TObject); begin - if fType='10' then frmClothHCList.ModalResult:=1; + if fType = '10' then + frmClothHCList.ModalResult := 1; end; procedure TfrmClothHCList.Button1Click(Sender: TObject); begin - if fType='10' then frmClothHCList.ModalResult:=1; + if fType = '10' then + frmClothHCList.ModalResult := 1; end; end. + diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index d1eb901..b466f00 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -1854,7 +1854,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object KH: TBtnEditA Left = 256 - Top = 0 + Top = 1 Width = 145 Height = 37 AutoSize = False diff --git a/打卷检验管理/U_OrderInPut.dfm b/打卷检验管理/U_OrderInPut.dfm index 601ec41..850445b 100644 --- a/打卷检验管理/U_OrderInPut.dfm +++ b/打卷检验管理/U_OrderInPut.dfm @@ -1823,6 +1823,10 @@ object frmOrderInPut: TfrmOrderInPut HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column3: TcxGridDBColumn + Caption = #25490#21333#26102#38388 + DataBinding.FieldName = 'PDtime' + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/打卷检验管理/U_OrderInPut.pas b/打卷检验管理/U_OrderInPut.pas index c1f0cfe..52de54a 100644 --- a/打卷检验管理/U_OrderInPut.pas +++ b/打卷检验管理/U_OrderInPut.pas @@ -12,20 +12,20 @@ uses cxCurrencyEdit, cxImage, Menus, cxLookAndFeelPainters, cxButtons, cxDBEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_Preview, - RM_DsgGridReport, RM_e_Graphic, RM_e_bmp, 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; + RM_DsgGridReport, RM_e_Graphic, RM_e_bmp, 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 TfrmOrderInPut = class(TForm) @@ -193,6 +193,7 @@ type QryCheckNet: TADOQuery; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -1046,6 +1047,7 @@ begin begin Edit; FieldByName('XHNO').Value := IntToStr(i); + FieldByName('PDtime').Value := formatdatetime('yyyy-MM-dd', SGetServerDateTime(ADOTemp)); FieldByName('PRTColor').Value := ''; FieldByName('PRTOrderQty').Value := null; FieldByName('PRTPrice').Value := 0; @@ -1064,7 +1066,7 @@ begin if Trim(Order_Sub.fieldbyname('SubId').AsString) <> '' then begin - if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then Exit; with ADOCmd do begin diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas index b559c7e..bf93ba1 100644 --- a/打卷检验管理/U_ProductOrderNewList.pas +++ b/打卷检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm)