From 9b95b3f0d59008de8305456f3649f4625a321f57 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 2 Dec 2025 17:18:16 +0800 Subject: [PATCH] ~ --- 打卷检验管理/U_CKProductJYHZList.dfm | 8 +- 打卷检验管理/U_CKProductJYHZList.pas | 171 ++++++++++++++------------- 打卷检验管理/U_JYOrderCDOne.pas | 6 +- 3 files changed, 93 insertions(+), 92 deletions(-) diff --git a/打卷检验管理/U_CKProductJYHZList.dfm b/打卷检验管理/U_CKProductJYHZList.dfm index cd03ff0..8c906a3 100644 --- a/打卷检验管理/U_CKProductJYHZList.dfm +++ b/打卷检验管理/U_CKProductJYHZList.dfm @@ -194,6 +194,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Width = 18 Height = 12 Caption = 'PO#' + Visible = False end object MPRTCodeName: TEdit Tag = 2 @@ -317,6 +318,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Width = 80 Height = 20 TabOrder = 12 + Visible = False OnChange = MPRTCodeNameChange end end @@ -382,12 +384,6 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList HeaderAlignmentHorz = taCenter Width = 80 end - object v1Column10: TcxGridDBColumn - Caption = 'PO#' - DataBinding.FieldName = 'khconNO' - HeaderAlignmentHorz = taCenter - Width = 80 - end object v2Column1: TcxGridDBColumn Caption = #20013#25991#21517#31216 DataBinding.FieldName = 'PRTCodeName' diff --git a/打卷检验管理/U_CKProductJYHZList.pas b/打卷检验管理/U_CKProductJYHZList.pas index 1a48f91..3650a63 100644 --- a/打卷检验管理/U_CKProductJYHZList.pas +++ b/打卷检验管理/U_CKProductJYHZList.pas @@ -4,14 +4,26 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, - cxDataStorage, cxEdit, DB, cxDBData, cxGridCustomTableView, - cxGridTableView, cxGridBandedTableView, cxGridDBBandedTableView, - cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridDBTableView, - cxGrid, StdCtrls, ComCtrls, ExtCtrls, ToolWin, cxGridCustomPopupMenu, - cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, MovePanel, cxButtonEdit, - cxCalendar, RM_System, RM_Common, RM_Class, RM_GridReport, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses, + cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, + ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, + cxDropDownEdit, MovePanel, cxButtonEdit, cxCalendar, RM_System, RM_Common, + RM_Class, RM_GridReport, 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 TfrmCKProductJYHZList = class(TForm) @@ -73,7 +85,6 @@ type RichEdit1: TRichEdit; v1Column2: TcxGridDBColumn; v1Column9: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; conNo: TEdit; Label14: TLabel; KHCONNO: TEdit; @@ -95,19 +106,15 @@ type procedure TBExportClick(Sender: TObject); procedure TBFindClick(Sender: TObject); procedure MPRTCodeNameChange(Sender: TObject); - procedure v1Column5PropertiesButtonClick(Sender: TObject; - AButtonIndex: Integer); + procedure v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure PRTColorChange(Sender: TObject); procedure Image2Click(Sender: TObject); - procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); - procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure TBPrintClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); private - FLeft,FTop:Integer; + FLeft, FTop: Integer; procedure InitGrid(); { Private declarations } public @@ -118,27 +125,27 @@ var frmCKProductJYHZList: TfrmCKProductJYHZList; implementation + uses - U_DataLink,U_Fun,U_ZDYHelp,U_JYOrderCDOne; + U_DataLink, U_Fun, U_ZDYHelp, U_JYOrderCDOne; {$R *.dfm} procedure TfrmCKProductJYHZList.FormDestroy(Sender: TObject); begin - frmCKProductJYHZList:=nil; + frmCKProductJYHZList := nil; end; -procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; - var Action: TCloseAction); +procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmCKProductJYHZList.FormCreate(Sender: TObject); begin //cxGrid1.Align:=alClient; - BegDate.DateTime:=SGetServerDateTime(ADOQueryTemp); - EndDate.DateTime:=SGetServerDateTime(ADOQueryTemp) + BegDate.DateTime := SGetServerDateTime(ADOQueryTemp); + EndDate.DateTime := SGetServerDateTime(ADOQueryTemp) end; procedure TfrmCKProductJYHZList.InitGrid(); @@ -147,28 +154,27 @@ begin ADOQueryMain.DisableControls; with ADOQueryMain do begin - Close; + Close; sql.Clear; - Filtered:=False; + Filtered := False; sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4, '); sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as MJQty4,'); - sql.Add('JQty=(select count(*) from WFB_MJJY X where X.SubId=A.SubId),'); - sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('SkcROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); - sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('KCROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); - sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)'); + SQL.Add('SUM(CASE WHEN A.ckflag=''ѳ'' THEN A.MJLen ELSE 0 END) as SCKROLL'); + SQL.Add(',SUM(CASE WHEN A.ckflag=''δ'' THEN A.MJLen ELSE 0 END) as SkcROLL'); + SQL.Add(',SUM(CASE WHEN A.ckflag=''ѳ'' THEN 1 ELSE 0 END) as CKROLL'); + SQL.Add(',SUM(CASE WHEN A.ckflag=''δ'' THEN 1 ELSE 0 END) as KCROLL'); +// sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)'); sql.Add('from WFB_MJJY A '); sql.Add('inner join JYOrder_Main C on C.MainId=A.MainId '); sql.Add('inner join JYOrder_sub D on D.subID=A.subID '); - Sql.add('where A.fillTime>='''+formatdateTime('yyyy-MM-dd',begdate.Date)+''' '); - Sql.add('and A.fillTime<'''+formatdateTime('yyyy-MM-dd',enddate.Date+1)+''' '); + Sql.add('where A.fillTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); + Sql.add('and A.fillTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); Sql.add('group by convert(char(10),A.fillTime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4'); +// ShowMessage(SQL.Text); Open; - //ShowMessage(SQL.Text); end; - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); finally ADOQueryMain.EnableControls; end; @@ -177,34 +183,35 @@ end; procedure TfrmCKProductJYHZList.TBRafreshClick(Sender: TObject); begin //BegDate.SetFocus; - MovePanel2.Visible:=True; + MovePanel2.Visible := True; MovePanel2.Refresh; InitGrid(); - MovePanel2.Visible:=False; + MovePanel2.Visible := False; end; procedure TfrmCKProductJYHZList.ConNoMChange(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); end; end; procedure TfrmCKProductJYHZList.TBCloseClick(Sender: TObject); begin - WriteCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); + WriteCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); Close; end; procedure TfrmCKProductJYHZList.FormShow(Sender: TObject); begin - ReadCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); - if Trim(DParameters2)='' then + ReadCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); + if Trim(DParameters2) = '' then begin //v1Column5.Options.Focusing:=True; - end else + end + else begin //v1Column5.Options.Focusing:=False; end; @@ -213,17 +220,18 @@ end; procedure TfrmCKProductJYHZList.TBExportClick(Sender: TObject); begin - if ADOQueryMain.IsEmpty then exit; - TcxGridToExcel('б',cxGrid2); + if ADOQueryMain.IsEmpty then + exit; + TcxGridToExcel('б', cxGrid2); end; procedure TfrmCKProductJYHZList.TBFindClick(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); end; end; @@ -232,28 +240,27 @@ begin TBFind.Click; end; -procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick( - Sender: TObject; AButtonIndex: Integer); +procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='SOrdDefStr10'; - flagname:='ŵص'; - if ShowModal=1 then + flag := 'SOrdDefStr10'; + flagname := 'ŵص'; + if ShowModal = 1 then begin with CDS_Main do begin Edit; - FieldByName('SOrdDefStr10').Value:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + FieldByName('SOrdDefStr10').Value := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('Update JYOrder_Sub Set SOrdDefStr10='''+Trim(ClientDataSet1.fieldbyname('ZdyName').AsString)+''''); - sql.Add(' where SubId='''+Trim(Self.CDS_Main.fieldbyname('SubId').AsString)+''''); + sql.Add('Update JYOrder_Sub Set SOrdDefStr10=''' + Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) + ''''); + sql.Add(' where SubId=''' + Trim(Self.CDS_Main.fieldbyname('SubId').AsString) + ''''); ExecSQL; end; end; @@ -270,49 +277,47 @@ end; procedure TfrmCKProductJYHZList.Image2Click(Sender: TObject); begin - Panel4.Visible:=False; + Panel4.Visible := False; end; -procedure TfrmCKProductJYHZList.Tv1CellDblClick( - Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); +procedure TfrmCKProductJYHZList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin - Panel4.Left:=FLeft; - Panel4.Top:=FTop+110; - Panel4.Visible:=True; - Panel10.Caption:=Trim(TV1.Controller.FocusedColumn.Caption); - RichEdit1.Text:=CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; + Panel4.Left := FLeft; + Panel4.Top := FTop + 110; + Panel4.Visible := True; + Panel10.Caption := Trim(TV1.Controller.FocusedColumn.Caption); + RichEdit1.Text := CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; application.ProcessMessages; end; -procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); +procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - FLeft:=X; - FTop:=Y; + FLeft := X; + FTop := Y; end; procedure TfrmCKProductJYHZList.TBPrintClick(Sender: TObject); begin - RMGridReport1.PreviewButtons:=[pbZoom,pbLoad,pbSave,pbPrint,pbFind,pbPageSetup,pbExit,pbExport,pbNavigator]; + RMGridReport1.PreviewButtons := [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbPageSetup, pbExit, pbExport, pbNavigator]; end; procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject); begin - if cds_main.IsEmpty then Exit; - frmJYOrderCDOne:=TfrmJYOrderCDOne.Create(Application); - with frmJYOrderCDOne do + if cds_main.IsEmpty then + Exit; + frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application); + with frmJYOrderCDOne do + begin + orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring); + gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring); + PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring); + if ShowModal = 1 then begin - orderno.Text:=trim(self.CDS_Main.fieldbyname('orderno').asstring); - gangno.Text:=trim(self.CDS_Main.fieldbyname('MJStr4').asstring); - PRTColor.Text:=trim(self.CDS_Main.fieldbyname('PRTColor').asstring); - if ShowModal=1 then - begin // InitGrid(); - end; - free; end; + free; + end; end; end. + diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 5fc4394..b08e392 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -389,9 +389,9 @@ begin Close; Filtered := False; sql.Clear; - sql.Add('select A.*,'); + sql.Add('select A.*,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,'); - sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*'); + sql.Add('C.OrderNo,B.PRTCodeName,B.prtkuanno,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PRTMF,B.PRTKZ'); // sql.Add(',KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); // sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); SQL.Add('from WFB_MJJY A'); @@ -409,7 +409,7 @@ begin SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally - ADOQueryMain.EnableControls; + ADOQueryMain.EnableControls; end; tbfind.Click; end;