From 16f469112bea93f8aed466b2d415b4a85823298e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”> Date: Sun, 20 Apr 2025 19:04:52 +0800 Subject: [PATCH] 111 --- A00通用窗体/U_YarnInfoSel.dfm | 19 ++++++++++++++++- A00通用窗体/U_YarnInfoSel.pas | 4 +++- B02基础纱线仓库/U_GetDllForm.pas | 2 +- B02基础纱线仓库/U_YarnInEdit.dfm | 2 +- B02基础纱线仓库/U_YarnInEdit.pas | 3 ++- B02基础纱线仓库/U_YarnInList.pas | 2 +- B02基础纱线仓库/U_YarnInfoInPut.dfm | 23 ++++++++++++++++++++ B02基础纱线仓库/U_YarnInfoInPut.pas | 33 +++++++++++++++++++++++++---- B02基础纱线仓库/U_YarnInfoList.dfm | 18 ++++++++++++++++ B02基础纱线仓库/U_YarnInfoList.pas | 3 +++ B02基础纱线仓库/U_YarnOutEdit.pas | 6 +++--- B02基础纱线仓库/U_YarnOutList.dfm | 1 - B02基础纱线仓库/U_YarnOutList.pas | 1 + B02基础纱线仓库/U_YarnStkHZSel.pas | 4 ++-- B02基础纱线仓库/U_YarnStkList.dfm | 9 -------- B02基础纱线仓库/U_YarnStkList.pas | 5 ++--- 16 files changed, 107 insertions(+), 28 deletions(-) diff --git a/A00通用窗体/U_YarnInfoSel.dfm b/A00通用窗体/U_YarnInfoSel.dfm index 1586ad3..17588b7 100644 --- a/A00通用窗体/U_YarnInfoSel.dfm +++ b/A00通用窗体/U_YarnInfoSel.dfm @@ -135,7 +135,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel end object v1Column2: TcxGridDBColumn Tag = 2 - Caption = #21697#29260 + Caption = #31867#22411 DataBinding.FieldName = 'Brand' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -252,6 +252,23 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Options.Editing = False Width = 118 end + object cxgrdbclmnTv1Column3: TcxGridDBColumn + Caption = #20379#24212#21830#32534#21495 + DataBinding.FieldName = 'FromCoNo' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object cxgrdbclmnTv1Column4: TcxGridDBColumn + Caption = #20379#24212#21830 + DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/A00通用窗体/U_YarnInfoSel.pas b/A00通用窗体/U_YarnInfoSel.pas index 6df4bb8..f25bca9 100644 --- a/A00通用窗体/U_YarnInfoSel.pas +++ b/A00通用窗体/U_YarnInfoSel.pas @@ -63,6 +63,8 @@ type PM_1: TPopupMenu; N1: TMenuItem; N2: TMenuItem; + cxgrdbclmnTv1Column3: TcxGridDBColumn; + cxgrdbclmnTv1Column4: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -137,7 +139,7 @@ begin Close; sql.Clear; sql.Add(' select A.* '); - sql.Add(' from BS_Yarn_Info A'); + sql.Add(' from BS_Yarn_Info A order by Brand,Y_Name desc'); Open; end; SCreateCDS(ADOQueryMain, CDS_1); diff --git a/B02基础纱线仓库/U_GetDllForm.pas b/B02基础纱线仓库/U_GetDllForm.pas index 6e93727..2dcc0cf 100644 --- a/B02基础纱线仓库/U_GetDllForm.pas +++ b/B02基础纱线仓库/U_GetDllForm.pas @@ -78,7 +78,7 @@ begin Parameters1 := 'ѯ'; Parameters1 := ''; - Parameters2 := ''; + Parameters2 := ''; end else begin diff --git a/B02基础纱线仓库/U_YarnInEdit.dfm b/B02基础纱线仓库/U_YarnInEdit.dfm index e1a1b94..9a5d0da 100644 --- a/B02基础纱线仓库/U_YarnInEdit.dfm +++ b/B02基础纱线仓库/U_YarnInEdit.dfm @@ -123,8 +123,8 @@ inherited frmYarnInEdit: TfrmYarnInEdit Caption = #31867#22411 DataBinding.FieldName = 'Brand' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' HeaderAlignmentHorz = taCenter - Options.Editing = False Width = 75 end object v1SPName: TcxGridDBColumn diff --git a/B02基础纱线仓库/U_YarnInEdit.pas b/B02基础纱线仓库/U_YarnInEdit.pas index 379ba35..bcbabc4 100644 --- a/B02基础纱线仓库/U_YarnInEdit.pas +++ b/B02基础纱线仓库/U_YarnInEdit.pas @@ -458,7 +458,8 @@ begin FieldByName('Y_Spec').Value := CDS_1.fieldbyname('Y_Spec').value; FieldByName('Y_Composition').Value := CDS_1.fieldbyname('Y_Composition').value; FieldByName('Denier').Value := CDS_1.fieldbyname('Denier').value; -// FieldByName('Y_Color').Value := CDS_1.fieldbyname('Y_Color').value; + FieldByName('FromCoName').Value := CDS_1.fieldbyname('FromCoName').value; + FieldByName('FromCoNo').Value := Trim(CDS_1.fieldbyname('FromCoNo').value); end; end; end; diff --git a/B02基础纱线仓库/U_YarnInList.pas b/B02基础纱线仓库/U_YarnInList.pas index 223e6c3..4301a64 100644 --- a/B02基础纱线仓库/U_YarnInList.pas +++ b/B02基础纱线仓库/U_YarnInList.pas @@ -166,7 +166,7 @@ begin sql.Add(' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + ''''); sql.Add(' and isnull(StkName,'''')=''' + Trim(FStkName) + ''''); SQL.Add(' and IOFlag='''' '); - SQL.Add(' order by IOTime desc'); + SQL.Add(' order by StkCoName,Brand,Y_Name,IOTime desc'); // ShowMessage(sql.text); Open; end; diff --git a/B02基础纱线仓库/U_YarnInfoInPut.dfm b/B02基础纱线仓库/U_YarnInfoInPut.dfm index 0dc3156..d362d70 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.dfm +++ b/B02基础纱线仓库/U_YarnInfoInPut.dfm @@ -140,6 +140,29 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut HeaderAlignmentHorz = taCenter Width = 118 end + object cxgrdbclmnTv1Column2: TcxGridDBColumn + Caption = #20379#24212#21830 + DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = cxgrdbclmnTv1Column2PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 80 + end + object cxgrdbclmnTv1Column3: TcxGridDBColumn + Caption = #20379#24212#21830#32534#21495 + DataBinding.FieldName = 'FromCoNo' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/B02基础纱线仓库/U_YarnInfoInPut.pas b/B02基础纱线仓库/U_YarnInfoInPut.pas index 52dd770..7de7610 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.pas +++ b/B02基础纱线仓库/U_YarnInfoInPut.pas @@ -43,6 +43,8 @@ type Tv1Column1: TcxGridDBColumn; ADOConnection1: TADOConnection; ImageList1: TImageList; + cxgrdbclmnTv1Column2: TcxGridDBColumn; + cxgrdbclmnTv1Column3: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -51,13 +53,13 @@ type procedure TBSaveClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure FormCreate(Sender: TObject); + procedure cxgrdbclmnTv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private { Private declarations } function SaveCKData(): Boolean; public { Public declarations } FBCId, FSTKName: string; - end; var @@ -66,10 +68,32 @@ var implementation uses - U_DataLink, U_RTFun, U_ZDYHelp; + U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel; {$R *.dfm} +procedure TfrmYarnInfoInPut.cxgrdbclmnTv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmCompanySel := TfrmCompanySel.Create(Application); + with frmCompanySel do + begin + FCoType := 'Ӧ'; + if ShowModal = 1 then + begin + with Self.CDS_Sub do + begin + Edit; + FieldByName('FromCoNo').Value := Trim(CDS_1.fieldbyname('CoCode').AsString); + FieldByName('FromCoName').Value := Trim(CDS_1.fieldbyname('CoAbbrName').AsString); + end; + end; + end; + finally + frmCompanySel.Free; + end; +end; + procedure TfrmYarnInfoInPut.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -182,8 +206,9 @@ begin end; procedure TfrmYarnInfoInPut.FormCreate(Sender: TObject); -begin inherited; - try +begin + inherited; + try with ADOConnection1 do begin Connected := false; diff --git a/B02基础纱线仓库/U_YarnInfoList.dfm b/B02基础纱线仓库/U_YarnInfoList.dfm index 7765a8c..07e5c0b 100644 --- a/B02基础纱线仓库/U_YarnInfoList.dfm +++ b/B02基础纱线仓库/U_YarnInfoList.dfm @@ -311,6 +311,7 @@ inherited frmYarnInfoList: TfrmYarnInfoList Caption = #22791#27880 DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 102 end object Tv1Column1: TcxGridDBColumn @@ -321,6 +322,23 @@ inherited frmYarnInfoList: TfrmYarnInfoList Options.Editing = False Width = 90 end + object cxgrdbclmnTv1Column4: TcxGridDBColumn + Caption = #20379#24212#21830 + DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object cxgrdbclmnTv1Column5: TcxGridDBColumn + Caption = #20379#24212#21830#32534#21495 + DataBinding.FieldName = 'FromCoNo' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/B02基础纱线仓库/U_YarnInfoList.pas b/B02基础纱线仓库/U_YarnInfoList.pas index c31f8b8..aaa0b36 100644 --- a/B02基础纱线仓库/U_YarnInfoList.pas +++ b/B02基础纱线仓库/U_YarnInfoList.pas @@ -63,6 +63,8 @@ type Tv1Column3: TcxGridDBColumn; ToolButton1: TToolButton; Tv1Column1: TcxGridDBColumn; + cxgrdbclmnTv1Column4: TcxGridDBColumn; + cxgrdbclmnTv1Column5: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -117,6 +119,7 @@ begin sql.Add(' select A.* '); sql.Add(' from BS_Yarn_Info A'); sql.Add(' where isnull(StkName,'''')=''' + Trim(FStkName) + ''''); + sql.Add(' order by Brand,FromCoName,Y_Name'); Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/B02基础纱线仓库/U_YarnOutEdit.pas b/B02基础纱线仓库/U_YarnOutEdit.pas index 22e2257..3de64e4 100644 --- a/B02基础纱线仓库/U_YarnOutEdit.pas +++ b/B02基础纱线仓库/U_YarnOutEdit.pas @@ -183,11 +183,11 @@ begin FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); FieldByName('STKID').Value := frmYarnStkSel.CDS_Main.fieldbyname('BYIOID').Value; FieldByName('IOType').Value := ''; - FieldByName('FromCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('FromCoNo').Value; //Եλ + //FieldByName('FromCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('FromCoNo').Value; //Եλ FieldByName('FromCoName').Value := frmYarnStkSel.CDS_Main.fieldbyname('FromCoName').Value; - FieldByName('StkCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoNo').Value; //ŵλ + // FieldByName('StkCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoNo').Value; //ŵλ FieldByName('StkCoName').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoName').Value; - FieldByName('ToCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoNo').Value; //λ + // FieldByName('ToCoNo').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoNo').Value; //λ FieldByName('ToCoName').Value := frmYarnStkSel.CDS_Main.fieldbyname('StkCoName').Value; FieldByName('Brand').Value := frmYarnStkSel.CDS_Main.fieldbyname('Brand').Value; diff --git a/B02基础纱线仓库/U_YarnOutList.dfm b/B02基础纱线仓库/U_YarnOutList.dfm index 4b6d38f..d55bf62 100644 --- a/B02基础纱线仓库/U_YarnOutList.dfm +++ b/B02基础纱线仓库/U_YarnOutList.dfm @@ -107,7 +107,6 @@ inherited frmYarnOutList: TfrmYarnOutList BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 - ExplicitTop = 39 object Label1: TLabel Left = 28 Top = 10 diff --git a/B02基础纱线仓库/U_YarnOutList.pas b/B02基础纱线仓库/U_YarnOutList.pas index 03f7035..dc8c40e 100644 --- a/B02基础纱线仓库/U_YarnOutList.pas +++ b/B02基础纱线仓库/U_YarnOutList.pas @@ -164,6 +164,7 @@ begin sql.Add(' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + ''''); sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); SQL.Add(' and ioFlag='''' '); + SQL.Add(' order by StkCoName,Brand,Y_Name,IOTime desc '); // if cxTabControl1.TabIndex = 0 then // begin // Sql.Add(' and ZFFlag=0 '); diff --git a/B02基础纱线仓库/U_YarnStkHZSel.pas b/B02基础纱线仓库/U_YarnStkHZSel.pas index 708e63b..ab63c73 100644 --- a/B02基础纱线仓库/U_YarnStkHZSel.pas +++ b/B02基础纱线仓库/U_YarnStkHZSel.pas @@ -109,10 +109,10 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select FromCoNo,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition'); + sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition'); sql.Add(' from BS_Yarn_IO A where'); sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); - sql.Add('GROUP BY FromCoNo,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); + sql.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); SQL.Add('HAVING sum(ioqtyflag*qty)>0'); sql.Add('order by StkCoName,Brand,Y_Name'); Open; diff --git a/B02基础纱线仓库/U_YarnStkList.dfm b/B02基础纱线仓库/U_YarnStkList.dfm index 56acb60..35ece74 100644 --- a/B02基础纱线仓库/U_YarnStkList.dfm +++ b/B02基础纱线仓库/U_YarnStkList.dfm @@ -134,7 +134,6 @@ inherited frmYarnStkList: TfrmYarnStkList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitLeft = 1 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -253,14 +252,6 @@ inherited frmYarnStkList: TfrmYarnStkList Options.Editing = False Width = 74 end - object Tv1Column8: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'Price' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #21333#20301 diff --git a/B02基础纱线仓库/U_YarnStkList.pas b/B02基础纱线仓库/U_YarnStkList.pas index a0b9f5a..40fd58c 100644 --- a/B02基础纱线仓库/U_YarnStkList.pas +++ b/B02基础纱线仓库/U_YarnStkList.pas @@ -46,7 +46,6 @@ type ToolButton2: TToolButton; Tv1Column2: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; ToolButton3: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -112,14 +111,14 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition '); + sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),QtyUnit,StkPosition '); sql.Add(' from BS_Yarn_IO A '); SQL.Add(' where 1=1 '); // isnull(StkQty,0)>0 if FstkName <> '' then begin sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); end; - SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); + SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,QtyUnit,StkPosition'); SQL.Add('HAVING sum(ioqtyflag*qty)>0'); sql.Add('order by StkCoName,Brand,Y_Name');