优化
This commit is contained in:
DESKTOP-E401PHE\Administrator
parent
b22a6b268e
commit
7d40dcb34b
|
|
@ -43,16 +43,24 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
|
|||
ImageIndex = 21
|
||||
OnClick = ToolButton5Click
|
||||
end
|
||||
object ToolButton3: TToolButton
|
||||
object ToolButton1: TToolButton
|
||||
Left = 174
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #21246#36873#25171#21360
|
||||
ImageIndex = 21
|
||||
OnClick = ToolButton1Click
|
||||
end
|
||||
object ToolButton3: TToolButton
|
||||
Left = 277
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #20445#23384#26684#24335
|
||||
ImageIndex = 16
|
||||
OnClick = ToolButton3Click
|
||||
end
|
||||
object TBClose: TToolButton
|
||||
Left = 277
|
||||
Left = 380
|
||||
Top = 0
|
||||
AutoSize = True
|
||||
Caption = #20851#38381
|
||||
|
|
@ -125,7 +133,6 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
|
|||
Align = alClient
|
||||
PopupMenu = PopupMenu2
|
||||
TabOrder = 0
|
||||
ExplicitTop = 2
|
||||
object Tv1: TcxGridDBTableView
|
||||
OnDblClick = Tv1DblClick
|
||||
OnMouseDown = Tv1MouseDown
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ type
|
|||
Tv1Column6: TcxGridDBColumn;
|
||||
DS_RCPM: TDataSource;
|
||||
ADO_RCPM: TADOQuery;
|
||||
ToolButton1: TToolButton;
|
||||
procedure TBCloseClick(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure TBSaveClick(Sender: TObject);
|
||||
|
|
@ -110,6 +111,7 @@ type
|
|||
procedure Tv1Column5PropertiesEditValueChanged(Sender: TObject);
|
||||
procedure ToolButton5Click(Sender: TObject);
|
||||
procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
|
||||
procedure ToolButton1Click(Sender: TObject);
|
||||
private
|
||||
FSCXDH: string;
|
||||
FShowKeyid: integer;
|
||||
|
|
@ -117,7 +119,6 @@ type
|
|||
procedure ZDYHelp(FButn: TcxButtonEdit; LType: string);
|
||||
function SaveData(): Boolean;
|
||||
function getTMMNo(fconNo: string): string;
|
||||
|
||||
procedure SetXH();
|
||||
procedure initGrid1(MTIMID: string);
|
||||
procedure HotyKey(var msg: TMessage); message WM_HOTKEY; //¿ì½Ý¼ü
|
||||
|
|
@ -593,6 +594,37 @@ begin
|
|||
|
||||
end;
|
||||
|
||||
procedure TfrmItemizedListInPut.ToolButton1Click(Sender: TObject);
|
||||
var
|
||||
MFiltration: string;
|
||||
MPrintJson: string;
|
||||
begin
|
||||
if FTIMID = '' then
|
||||
Exit;
|
||||
|
||||
with ADOQueryBaseTemp do
|
||||
begin
|
||||
close;
|
||||
sql.Clear;
|
||||
sql.Add(' select Filtration= SUBSTRING(CAST((select distinct '','' +A.BCIOID from BS_Cloth_IO A ');
|
||||
sql.Add(' where A.IOFlag=''Èë¿â'' ');
|
||||
sql.Add(' and exists(SELECT * from [dbo].[F_Tool_SplitString](' + quotedstr(SelCDSKey(CDS_1, ['TISId'])[0]) + ','','') SP where SP.RTValue=A.TISId ) ');
|
||||
sql.Add(' for xml path('''') ) AS VARCHAR(max)) , 2, 8000)');
|
||||
open;
|
||||
end;
|
||||
|
||||
MFiltration := Trim(ADOQueryBaseTemp.FieldByName('Filtration').AsString);
|
||||
|
||||
MPrintJson := ' {"LMType": "TradeFinishClothInPrt1" ';
|
||||
MPrintJson := MPrintJson + ' ,"PreviewPrint": true ';
|
||||
MPrintJson := MPrintJson + ' ,"PrtArgs": [ { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
|
||||
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
|
||||
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
|
||||
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
|
||||
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } ';
|
||||
FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
|
||||
end;
|
||||
|
||||
procedure TfrmItemizedListInPut.ToolButton2Click(Sender: TObject);
|
||||
begin
|
||||
begin
|
||||
|
|
@ -765,7 +797,7 @@ begin
|
|||
sql.Clear;
|
||||
sql.Add(' select Filtration= SUBSTRING(CAST((select distinct '','' +A.BCIOID from BS_Cloth_IO A ');
|
||||
sql.Add(' where A.IOFlag=''Èë¿â'' and TIMID= ' + quotedstr(Trim(FTIMID)));
|
||||
sql.Add(' for xml path('''') ) AS VARCHAR(1000)) , 2, 1000)');
|
||||
sql.Add(' for xml path('''') ) AS VARCHAR(max)) , 2, 8000)');
|
||||
open;
|
||||
end;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -13,7 +13,8 @@ uses
|
|||
RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
|
||||
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
|
||||
dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer,
|
||||
cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters;
|
||||
cxProgressBar, cxButtons, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters,
|
||||
cxPC;
|
||||
|
||||
type
|
||||
TfrmTradeClothTotalStkList = class(TfrmBaseList)
|
||||
|
|
@ -23,7 +24,7 @@ type
|
|||
TBClose: TToolButton;
|
||||
Panel1: TPanel;
|
||||
ADOQueryCmd: TADOQuery;
|
||||
ADOQueryMain: TADOQuery;
|
||||
ADO_2: TADOQuery;
|
||||
ADOQueryTemp: TADOQuery;
|
||||
DS_1: TDataSource;
|
||||
GPM_1: TcxGridPopupMenu;
|
||||
|
|
@ -31,22 +32,28 @@ type
|
|||
PopupMenu1: TPopupMenu;
|
||||
Label3: TLabel;
|
||||
Label4: TLabel;
|
||||
Label8: TLabel;
|
||||
Label2: TLabel;
|
||||
C_name: TcxTextEdit;
|
||||
FromCoName: TcxTextEdit;
|
||||
C_spec: TcxTextEdit;
|
||||
BatchNo: TcxTextEdit;
|
||||
C_Color: TcxTextEdit;
|
||||
ToolButton2: TToolButton;
|
||||
Label6: TLabel;
|
||||
C_ColorNo: TcxTextEdit;
|
||||
N1: TMenuItem;
|
||||
N2: TMenuItem;
|
||||
ToolButton3: TToolButton;
|
||||
cxPageControl1: TcxPageControl;
|
||||
cxTabSheet1: TcxTabSheet;
|
||||
cxTabSheet2: TcxTabSheet;
|
||||
cxGrid1: TcxGrid;
|
||||
Tv1: TcxGridDBTableView;
|
||||
Tv1Column33: TcxGridDBColumn;
|
||||
Tv1Column13: TcxGridDBColumn;
|
||||
v1Column6: TcxGridDBColumn;
|
||||
v1Column2: TcxGridDBColumn;
|
||||
v1Column4: TcxGridDBColumn;
|
||||
v1Column14: TcxGridDBColumn;
|
||||
Tv1Column11: TcxGridDBColumn;
|
||||
Tv1Column20: TcxGridDBColumn;
|
||||
v2Column1: TcxGridDBColumn;
|
||||
v1Column8: TcxGridDBColumn;
|
||||
Tv1Column4: TcxGridDBColumn;
|
||||
|
|
@ -66,58 +73,45 @@ type
|
|||
Tv1Column21: TcxGridDBColumn;
|
||||
Tv1Column2: TcxGridDBColumn;
|
||||
Tv1Column10: TcxGridDBColumn;
|
||||
Tv1Column7: TcxGridDBColumn;
|
||||
Tv1Column8: TcxGridDBColumn;
|
||||
Tv1Column9: TcxGridDBColumn;
|
||||
Tv1Column12: TcxGridDBColumn;
|
||||
Tv1Column27: TcxGridDBColumn;
|
||||
Tv1Column15: TcxGridDBColumn;
|
||||
Tv1Column16: TcxGridDBColumn;
|
||||
Tv1Column17: TcxGridDBColumn;
|
||||
Tv1Column18: TcxGridDBColumn;
|
||||
Tv1Column22: TcxGridDBColumn;
|
||||
Tv1Column25: TcxGridDBColumn;
|
||||
Tv1Column24: TcxGridDBColumn;
|
||||
Tv1Column26: TcxGridDBColumn;
|
||||
Tv1Column23: TcxGridDBColumn;
|
||||
cxGrid1Level1: TcxGridLevel;
|
||||
Tv1Column7: TcxGridDBColumn;
|
||||
Label1: TLabel;
|
||||
Label5: TLabel;
|
||||
GC_Name: TcxTextEdit;
|
||||
CraftCode: TcxTextEdit;
|
||||
Tv1Column27: TcxGridDBColumn;
|
||||
Tv1Column28: TcxGridDBColumn;
|
||||
Tv1Column29: TcxGridDBColumn;
|
||||
Tv1Column30: TcxGridDBColumn;
|
||||
Tv1Column31: TcxGridDBColumn;
|
||||
Tv1Column32: TcxGridDBColumn;
|
||||
Label6: TLabel;
|
||||
Label7: TLabel;
|
||||
FtyPCId: TcxTextEdit;
|
||||
FromConNo: TcxTextEdit;
|
||||
Panel5: TPanel;
|
||||
ComboBox_Print: TcxComboBox;
|
||||
LabVolume: TcxTextEdit;
|
||||
cxButton1: TcxButton;
|
||||
cxButton2: TcxButton;
|
||||
ADOQueryPrint: TADOQuery;
|
||||
Tv1Column33: TcxGridDBColumn;
|
||||
N1: TMenuItem;
|
||||
N2: TMenuItem;
|
||||
Tv1Column34: TcxGridDBColumn;
|
||||
Tv1Column35: TcxGridDBColumn;
|
||||
Tv1Column36: TcxGridDBColumn;
|
||||
Tv1Column37: TcxGridDBColumn;
|
||||
Tv1Column38: TcxGridDBColumn;
|
||||
Tv1Column39: TcxGridDBColumn;
|
||||
Label28: TLabel;
|
||||
cxCbqfs: TcxComboBox;
|
||||
Tv1Column40: TcxGridDBColumn;
|
||||
ToolButton1: TToolButton;
|
||||
ToolButton3: TToolButton;
|
||||
cxGrid1Level1: TcxGridLevel;
|
||||
cxGrid2: TcxGrid;
|
||||
TV2: TcxGridDBTableView;
|
||||
cxGridDBColumn9: TcxGridDBColumn;
|
||||
cxGridDBColumn14: TcxGridDBColumn;
|
||||
cxGridDBColumn15: TcxGridDBColumn;
|
||||
cxGridDBColumn16: TcxGridDBColumn;
|
||||
cxGridDBColumn17: TcxGridDBColumn;
|
||||
cxGridDBColumn24: TcxGridDBColumn;
|
||||
cxGridDBColumn26: TcxGridDBColumn;
|
||||
cxGridDBColumn28: TcxGridDBColumn;
|
||||
cxGridDBColumn29: TcxGridDBColumn;
|
||||
cxGridLevel1: TcxGridLevel;
|
||||
GPM_2: TcxGridPopupMenu;
|
||||
CDS_2: TClientDataSet;
|
||||
DS_2: TDataSource;
|
||||
ADO_1: TADOQuery;
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
procedure TBRafreshClick(Sender: TObject);
|
||||
procedure ConNoMChange(Sender: TObject);
|
||||
procedure TBCloseClick(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure TBFindClick(Sender: TObject);
|
||||
|
|
@ -126,18 +120,18 @@ type
|
|||
procedure ToolButton2Click(Sender: TObject);
|
||||
procedure FromCoNamePropertiesChange(Sender: TObject);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure cxButton1Click(Sender: TObject);
|
||||
procedure cxButton2Click(Sender: TObject);
|
||||
procedure N1Click(Sender: TObject);
|
||||
procedure N2Click(Sender: TObject);
|
||||
procedure FromCoNameKeyPress(Sender: TObject; var Key: Char);
|
||||
procedure ToolButton1Click(Sender: TObject);
|
||||
procedure ToolButton3Click(Sender: TObject);
|
||||
procedure TV2DblClick(Sender: TObject);
|
||||
private
|
||||
procedure InitGrid();
|
||||
procedure InitGrid1();
|
||||
procedure InitGrid2();
|
||||
{ Private declarations }
|
||||
public
|
||||
FstkName, FC_Degree, FC_Pack, canshu4: string;
|
||||
FStkIdS, FstkName, FC_Degree, FC_Pack, canshu4: string;
|
||||
{ Public declarations }
|
||||
end;
|
||||
|
||||
|
|
@ -158,29 +152,6 @@ begin
|
|||
frmTradeClothTotalStkList := nil;
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.cxButton1Click(Sender: TObject);
|
||||
var
|
||||
mrecid: Integer;
|
||||
MaxBLCLID: string;
|
||||
begin
|
||||
mrecid := showFr3LableForm(DCode, DName, DConString, '标签选择');
|
||||
with ADOQueryTemp do
|
||||
begin
|
||||
close;
|
||||
sql.Clear;
|
||||
sql.Add('select top 1 * from Trade_Label');
|
||||
sql.Add('where recid=' + trim(IntToStr(mrecid)));
|
||||
Open;
|
||||
end;
|
||||
LabVolume.Text := Trim(ADOQueryTemp.fieldbyname('LabelCaption').AsString);
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.cxButton2Click(Sender: TObject);
|
||||
begin
|
||||
PrintServerLabel1(ADOQueryPrint, StrToIntDef(cxCbqfs.Text, 1), 0, ComboBox_Print.ItemIndex, SelCDSKey(CDS_1, ['BCIOID'])[0], LabVolume.text);
|
||||
InitGrid();
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
begin
|
||||
inherited;
|
||||
|
|
@ -195,10 +166,50 @@ begin
|
|||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.InitGrid();
|
||||
begin
|
||||
case cxPageControl1.ActivePageIndex of
|
||||
0:
|
||||
begin
|
||||
InitGrid2();
|
||||
end;
|
||||
1:
|
||||
begin
|
||||
|
||||
InitGrid1();
|
||||
end;
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.InitGrid2();
|
||||
var
|
||||
SqlStr: string;
|
||||
begin
|
||||
|
||||
SqlStr := ' select A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.StkPiece)),StkQty=sum(StkQty),QtyUnit ';
|
||||
SqlStr := SqlStr + ' from BS_Cloth_IO A ';
|
||||
SqlStr := SqlStr + ' where A.IOFlag=''Èë¿â'' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) ';
|
||||
SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + '''';
|
||||
|
||||
if FC_Degree <> '' then
|
||||
SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
|
||||
if FC_Pack <> '' then
|
||||
SqlStr := SqlStr + ' and isnull(C_Pack,'''')=''' + Trim(FC_Pack) + '''';
|
||||
|
||||
if Trim(canshu4) <> '' then
|
||||
SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
|
||||
|
||||
SqlStr := SqlStr + ' group by C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit';
|
||||
|
||||
InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
|
||||
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.InitGrid1();
|
||||
var
|
||||
SqlStr, WSqlStr: string;
|
||||
begin
|
||||
|
||||
SqlStr := ' select A.*,StkPieceint=CEILING(A.StkPiece) ';
|
||||
SqlStr := SqlStr + ' from BS_Cloth_IO A ';
|
||||
SqlStr := SqlStr + ' where A.IOFlag=''Èë¿â'' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) ';
|
||||
|
|
@ -208,24 +219,20 @@ begin
|
|||
SqlStr := SqlStr + ' and isnull(C_Degree,'''')=''' + Trim(FC_Degree) + '''';
|
||||
if FC_Pack <> '' then
|
||||
SqlStr := SqlStr + ' and isnull(C_Pack,'''')=''' + Trim(FC_Pack) + '''';
|
||||
SqlStr := SqlStr + ' order by IOTime desc';
|
||||
if Trim(canshu4) <> '' then
|
||||
SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
|
||||
InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
|
||||
WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"C_Code|C_Name|C_Color|C_ColorNo|C_Pattern|C_Degree|QtyUnit"}');
|
||||
if TRIM(WSqlStr) <> '' then
|
||||
SqlStr := SqlStr + ' and ' + WSqlStr;
|
||||
SqlStr := SqlStr + ' order by IOTime desc';
|
||||
|
||||
InitCDSData(ADO_1, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'BCIOID');
|
||||
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.TBRafreshClick(Sender: TObject);
|
||||
begin
|
||||
InitGrid();
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.ConNoMChange(Sender: TObject);
|
||||
begin
|
||||
if ADOQueryMain.Active then
|
||||
begin
|
||||
SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
|
||||
end;
|
||||
InitGrid2();
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.TBCloseClick(Sender: TObject);
|
||||
|
|
@ -238,7 +245,6 @@ procedure TfrmTradeClothTotalStkList.FormShow(Sender: TObject);
|
|||
begin
|
||||
inherited;
|
||||
ReadCxGrid(trim(Self.Caption), Tv1, 'óÒ×»ã×ֿܲâ');
|
||||
ComboBox_Print.Properties.Items.Assign(printer.Printers);
|
||||
canshu4 := Trim(self.fParameters4);
|
||||
InitGrid();
|
||||
end;
|
||||
|
|
@ -258,12 +264,17 @@ end;
|
|||
|
||||
procedure TfrmTradeClothTotalStkList.TBFindClick(Sender: TObject);
|
||||
begin
|
||||
if ADOQueryMain.Active then
|
||||
begin
|
||||
SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
|
||||
SCreateCDS(ADOQueryMain, CDS_1);
|
||||
SInitCDSData(ADOQueryMain, CDS_1);
|
||||
case cxPageControl1.ActivePageIndex of
|
||||
0:
|
||||
begin
|
||||
CDSDataFilter(ADO_2, CDS_2, Tv2, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, ' {"EquTag": 1,"LikeTag": 2,"Fields": "C_name|C_Color|C_ColorNo"}') + '" }');
|
||||
end;
|
||||
1:
|
||||
begin
|
||||
CDSDataFilter(ADO_1, CDS_1, Tv1, '{"FilterStr":"' + CommonFiltersByContainer(Panel1, ' {"EquTag": 1,"LikeTag": 2,"Fields": ""}') + '" }');
|
||||
end;
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.MPRTCodeNameChange(Sender: TObject);
|
||||
|
|
@ -283,29 +294,6 @@ begin
|
|||
SelOKNo(CDS_1, False);
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.ToolButton1Click(Sender: TObject);
|
||||
begin
|
||||
if trim(self.CDS_1.FieldByName('IOType').AsString) = '拆匹入库' then
|
||||
begin
|
||||
Application.MessageBox('拆匹入库数据无法拆分!', '提示', 0);
|
||||
exit;
|
||||
end;
|
||||
|
||||
try
|
||||
frmTradeClothSplit := TfrmTradeClothSplit.Create(Application);
|
||||
with frmTradeClothSplit do
|
||||
begin
|
||||
FStkID := trim(self.CDS_1.FieldByName('StkID').AsString);
|
||||
if ShowModal = 1 then
|
||||
begin
|
||||
InitGrid();
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
frmTradeClothSplit.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.ToolButton2Click(Sender: TObject);
|
||||
begin
|
||||
WriteCxGrid(trim(Self.Caption), Tv1, 'óÒ×»ã×ֿܲâ');
|
||||
|
|
@ -339,5 +327,11 @@ begin
|
|||
ModalResult := 1;
|
||||
end;
|
||||
|
||||
procedure TfrmTradeClothTotalStkList.TV2DblClick(Sender: TObject);
|
||||
begin
|
||||
cxPageControl1.ActivePageIndex := 1;
|
||||
InitGrid1();
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user