111
This commit is contained in:
parent
912a9ff6ef
commit
16f469112b
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -78,7 +78,7 @@ begin
|
|||
|
||||
Parameters1 := '查询';
|
||||
Parameters1 := '管理';
|
||||
Parameters2 := 'ÁúÓÎ';
|
||||
Parameters2 := 'º¼ÖÝ';
|
||||
end
|
||||
else
|
||||
begin
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -107,7 +107,6 @@ inherited frmYarnOutList: TfrmYarnOutList
|
|||
BevelOuter = bvLowered
|
||||
Color = clSkyBlue
|
||||
TabOrder = 1
|
||||
ExplicitTop = 39
|
||||
object Label1: TLabel
|
||||
Left = 28
|
||||
Top = 10
|
||||
|
|
|
@ -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 ');
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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');
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user