From 0bcc45f1e7a2eda2eb24dcc2e6994cbd54ba1b56 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 9 Jan 2026 15:53:40 +0800 Subject: [PATCH] ~ --- 打卷检验管理/U_CKProductJYHZList.pas | 4 +-- 打卷检验管理/U_JYOrderCDOne.dfm | 16 +++++----- 打卷检验管理/U_JYOrderCDOne.pas | 47 +++++++++++++++++----------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/打卷检验管理/U_CKProductJYHZList.pas b/打卷检验管理/U_CKProductJYHZList.pas index 6357815..3347a92 100644 --- a/打卷检验管理/U_CKProductJYHZList.pas +++ b/打卷检验管理/U_CKProductJYHZList.pas @@ -313,12 +313,12 @@ end; procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject); begin if cds_main.IsEmpty then - Exit; + 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); + MJStr4.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring); PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring); if ShowModal = 1 then begin diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 8fb7dbd..d9cbdb6 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -532,13 +532,13 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ParentFont = False end object Label1: TLabel - Left = 704 + Left = 706 Top = 39 Width = 52 Height = 12 Caption = #20986#24211#29366#24577 Font.Charset = GB2312_CHARSET - Font.Color = clWindowText + Font.Color = clRed Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] @@ -557,17 +557,19 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Style = [fsBold] ParentFont = False end - object TLabel + object TKHedit: TLabel Left = 322 Top = 39 Width = 26 Height = 12 Caption = #23458#25143 + Color = clSkyBlue Font.Charset = GB2312_CHARSET - Font.Color = clWindowText + Font.Color = clRed Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] + ParentColor = False ParentFont = False end object Label38: TLabel @@ -743,7 +745,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne TabOrder = 14 OnChange = PRTCodeNameChange end - object gangno: TEdit + object MJStr4: TEdit Tag = 2 Left = 1023 Top = 11 @@ -786,7 +788,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne TabOrder = 1 end object CKFlag: TComboBox - Tag = 2 + Tag = 1 Left = 761 Top = 34 Width = 78 @@ -826,7 +828,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnChange = PRTCodeNameChange end object CustomerNoName: TEdit - Tag = 2 + Tag = 1 Left = 350 Top = 35 Width = 76 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 229653f..5acf9da 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -122,7 +122,7 @@ type PRTHX: TEdit; v1Column4: TcxGridDBColumn; v1Column5: TcxGridDBColumn; - gangno: TEdit; + MJStr4: TEdit; Label15: TLabel; v1Column13: TcxGridDBColumn; v1Column18: TcxGridDBColumn; @@ -233,6 +233,7 @@ type DataSource2: TDataSource; ADOQuery1: TADOQuery; PRTColor: TEdit; + TKHedit: TLabel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -303,11 +304,11 @@ type FID: string; procedure InitGrid(); procedure InitSum(); - procedure InitForm(); + procedure InitForm(); procedure GetCDSData(); procedure GetBGData(); procedure JSbaoNum(); - { Private declarations } + { Private declarations } public FFInt: Integer; @@ -323,6 +324,7 @@ uses U_DataLink, U_OrderInPut, U_Fun, U_MJEdit, U_CPDBAO, U_MJSJFX; {$R *.dfm} + procedure TfrmJYOrderCDOne.JSbaoNum(); var i: integer; @@ -391,9 +393,16 @@ end; procedure TfrmJYOrderCDOne.InitGrid(); var - i: integer; + i: integer; j: Integer; + SqlStr, WSql: string; begin + WSql := SGetFilters(Panel1, 1, 2); + if trim(WSql) <> '' then + begin + WSql := ' and ' + trim(WSql); + end; + try // TV2.BeginUpdate(); ADOQueryMain.DisableControls; @@ -403,7 +412,7 @@ begin Filtered := False; sql.Clear; sql.Add('select A.mainid,A.subid,A.BaoNo,A.BaoId,A.MJstr4,A.MJXH,A.MJID,A.MJQty4,A.MJMaoZ,A.MJLen,A.MJTypeOther,A.MJQty2,A.Filler,A.Filltime '); - sql.Add(',A.MJSJKZ,A.MJSJKZ,A.CKFlag,A.Note,A.MJStr5,A.CDList,A.HXFlag,'); + sql.Add(',A.MJSJKZ,A.MJFK,A.CKFlag,A.Note,A.MJStr5,A.CDList,A.HXFlag,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno'); sql.Add(',C.CustomerNoName,C.OrderNo,B.PRTCodeName,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PIH'); // sql.Add(',KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); @@ -413,6 +422,11 @@ begin sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID '); sql.Add('where A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); + if trim(WSql) <> '' then + begin + SQL.Add('and 1=1 ' + WSql); + end; + if Trim(DParameters2) = 'Ʒ' then begin sql.add('and mjtype=''Ʒ'' '); @@ -422,9 +436,6 @@ begin Open; end; - // SCreateCDS20(ADOQueryMain, CDS_12); -// SInitCDSData20(ADOQueryMain, CDS_12); - SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally @@ -454,8 +465,8 @@ begin begin if Fieldbyname('ssel').AsBoolean then begin - i := TV1.Controller.FocusedRowIndex; - t := TV1.Controller.TopRowIndex; + i := Tv1.Controller.FocusedRowIndex; + t := Tv1.Controller.TopRowIndex; sumP := sumP + 1; sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); sumMZ := RoundFloat(sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat, 2); @@ -468,8 +479,8 @@ begin EnableControls; end; - TV1.Controller.FocusedRowIndex := i; - TV1.Controller.TopRowIndex := t; + Tv1.Controller.FocusedRowIndex := i; + Tv1.Controller.TopRowIndex := t; label22.Caption := 'ƥ:' + floattostr(sumP); label21.Caption := ':' + floattostr(sumLen); @@ -505,7 +516,7 @@ begin begin fsj := ' HXFlag=0 '; end - else if RadioGroup1.ItemIndex = 1 then + else if RadioGroup1.ItemIndex = 1 then begin fsj := ' HXFlag=1 '; end @@ -542,7 +553,7 @@ begin MovePanel2.Visible := True; MovePanel2.Refresh; InitGrid(); - MovePanel2.Visible := False; + MovePanel2.Visible := False; end; procedure TfrmJYOrderCDOne.OrderNoChange(Sender: TObject); @@ -603,8 +614,8 @@ begin Panel4.Top := FTop + 110; Panel4.Visible := True; Panel4.Refresh; - Panel10.Caption := Trim(TV1.Controller.FocusedColumn.Caption); - RichEdit1.Text := Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; + Panel10.Caption := Trim(Tv1.Controller.FocusedColumn.Caption); + RichEdit1.Text := Order_Main.fieldbyname(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; end; procedure TfrmJYOrderCDOne.TBManageClick(Sender: TObject); @@ -901,9 +912,9 @@ begin sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); end; - Open; + Open; end; - SCreateCDS20(ADOQueryMain, Order_Main); + SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally ADOQueryMain.EnableControls;