1
This commit is contained in:
parent
36c796ce9a
commit
d3bc6ad260
|
|
@ -146,20 +146,21 @@ begin
|
||||||
Close;
|
Close;
|
||||||
sql.Clear;
|
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('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,C.OrderNo,C.ConNO, ');
|
||||||
sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as MJQty4,');
|
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('JQty=(select count(*) from WFB_MJJY X where X.MainId=A.MainId),');
|
||||||
sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''已出库''),');
|
sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''已出库''),');
|
||||||
sql.Add('SkcROLL=(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.MainId=A.MainId and X.ckflag=''未出库''),');
|
||||||
sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''已出库''),');
|
sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''已出库''),');
|
||||||
sql.Add('KCROLL=(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.MainId=A.MainId and X.ckflag=''未出库''),');
|
||||||
sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)');
|
sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO),');
|
||||||
|
sql.add('PRTCodeName=(select top 1 PRTCodeName from JYOrder_Sub d where d.MainId=A.MainId)');
|
||||||
sql.Add('from WFB_MJJY A ');
|
sql.Add('from WFB_MJJY A ');
|
||||||
sql.Add('inner join JYOrder_Main C on C.MainId=A.MainId ');
|
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('where A.fillTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
|
||||||
Sql.add('and A.fillTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
|
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');
|
Sql.add('group by convert(char(10),A.fillTime,120),A.MJType,A.MainId,A.MJTypeother,C.OrderNo,C.ConNO');
|
||||||
Open;
|
Open;
|
||||||
//ShowMessage(SQL.Text);
|
//ShowMessage(SQL.Text);
|
||||||
end;
|
end;
|
||||||
|
|
@ -292,15 +293,17 @@ begin
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject);
|
procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject);
|
||||||
|
|
||||||
begin
|
begin
|
||||||
if cds_main.IsEmpty then
|
if cds_main.IsEmpty then
|
||||||
Exit;
|
Exit;
|
||||||
frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application);
|
frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application);
|
||||||
with frmJYOrderCDOne do
|
with frmJYOrderCDOne do
|
||||||
begin
|
begin
|
||||||
orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring);
|
Fmainid := trim(self.CDS_Main.fieldbyname('MAINID').asstring);
|
||||||
gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring);
|
// orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring);
|
||||||
PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring);
|
//gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring);
|
||||||
|
//PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring);
|
||||||
if ShowModal = 1 then
|
if ShowModal = 1 then
|
||||||
begin
|
begin
|
||||||
// InitGrid();
|
// InitGrid();
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
object frmClothHCList: TfrmClothHCList
|
object frmClothHCList: TfrmClothHCList
|
||||||
Left = 377
|
Left = 471
|
||||||
Top = 240
|
Top = 443
|
||||||
Width = 1179
|
Width = 1179
|
||||||
Height = 705
|
Height = 705
|
||||||
Caption = #26816#39564#25351#31034#21333#26597#35810
|
Caption = #26816#39564#25351#31034#21333#26597#35810
|
||||||
|
|
@ -20,7 +20,7 @@ object frmClothHCList: TfrmClothHCList
|
||||||
object ToolBar1: TToolBar
|
object ToolBar1: TToolBar
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1163
|
Width = 1171
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
ButtonHeight = 30
|
ButtonHeight = 30
|
||||||
ButtonWidth = 59
|
ButtonWidth = 59
|
||||||
|
|
@ -66,7 +66,7 @@ object frmClothHCList: TfrmClothHCList
|
||||||
object Panel1: TPanel
|
object Panel1: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 32
|
Top = 32
|
||||||
Width = 1163
|
Width = 1171
|
||||||
Height = 73
|
Height = 73
|
||||||
Align = alTop
|
Align = alTop
|
||||||
BevelInner = bvRaised
|
BevelInner = bvRaised
|
||||||
|
|
@ -289,8 +289,8 @@ object frmClothHCList: TfrmClothHCList
|
||||||
object cxGrid2: TcxGrid
|
object cxGrid2: TcxGrid
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 105
|
Top = 105
|
||||||
Width = 1163
|
Width = 1171
|
||||||
Height = 561
|
Height = 569
|
||||||
Align = alClient
|
Align = alClient
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
object TV2: TcxGridDBTableView
|
object TV2: TcxGridDBTableView
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
object frmJYOrderCDOne: TfrmJYOrderCDOne
|
object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
Left = 383
|
Left = 1020
|
||||||
Top = 471
|
Top = 275
|
||||||
Width = 1400
|
Width = 1400
|
||||||
Height = 757
|
Height = 757
|
||||||
Caption = #26816#39564#25253#21578
|
Caption = #26816#39564#25253#21578
|
||||||
|
|
@ -1799,8 +1799,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
object Panel13: TPanel
|
object Panel13: TPanel
|
||||||
Left = 120
|
Left = 248
|
||||||
Top = 376
|
Top = 480
|
||||||
Width = 273
|
Width = 273
|
||||||
Height = 129
|
Height = 129
|
||||||
Color = clSkyBlue
|
Color = clSkyBlue
|
||||||
|
|
|
||||||
|
|
@ -299,6 +299,7 @@ type
|
||||||
{ Private declarations }
|
{ Private declarations }
|
||||||
public
|
public
|
||||||
FFInt: Integer;
|
FFInt: Integer;
|
||||||
|
FMAINID: string;
|
||||||
|
|
||||||
{ Public declarations }
|
{ Public declarations }
|
||||||
end;
|
end;
|
||||||
|
|
@ -375,7 +376,7 @@ end;
|
||||||
procedure TfrmJYOrderCDOne.TBCloseClick(Sender: TObject);
|
procedure TfrmJYOrderCDOne.TBCloseClick(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
Close;
|
Close;
|
||||||
WriteCxGrid('检验报告JF', Tv1, '检验管理报告');
|
WriteCxGrid('检验管理报告JF', Tv1, '检验管理报告');
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TfrmJYOrderCDOne.InitGrid();
|
procedure TfrmJYOrderCDOne.InitGrid();
|
||||||
|
|
@ -404,6 +405,10 @@ begin
|
||||||
begin
|
begin
|
||||||
sql.add('and mjtype=''´ÎÆ·'' ');
|
sql.add('and mjtype=''´ÎÆ·'' ');
|
||||||
end;
|
end;
|
||||||
|
if Trim(fmainid) <> '' then
|
||||||
|
begin
|
||||||
|
sql.add('and C.mainid=''' + fmainid + ''' ');
|
||||||
|
end;
|
||||||
sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
|
sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
|
||||||
Open;
|
Open;
|
||||||
end;
|
end;
|
||||||
|
|
@ -466,7 +471,7 @@ procedure TfrmJYOrderCDOne.InitForm();
|
||||||
var
|
var
|
||||||
fsj, Strmd: string;
|
fsj, Strmd: string;
|
||||||
begin
|
begin
|
||||||
ReadCxGrid('检验报告JF', Tv1, '检验管理报告');
|
ReadCxGrid('检验管理报告JF', Tv1, '检验管理报告');
|
||||||
fsj := 'select distinct(Filler) name from WFB_MJJY ';
|
fsj := 'select distinct(Filler) name from WFB_MJJY ';
|
||||||
Strmd := 'select distinct(text) name,index1 from A_MaDan order by index1 ';
|
Strmd := 'select distinct(text) name,index1 from A_MaDan order by index1 ';
|
||||||
SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj);
|
SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj);
|
||||||
|
|
@ -555,7 +560,7 @@ begin
|
||||||
TBManage.Visible := False;
|
TBManage.Visible := False;
|
||||||
Toolbutton1.visible := False;
|
Toolbutton1.visible := False;
|
||||||
Toolbutton3.visible := False;
|
Toolbutton3.visible := False;
|
||||||
v1Column22.visible := False;
|
//v1Column22.visible := False;
|
||||||
// TCPDB.Visible:=False;
|
// TCPDB.Visible:=False;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
@ -1625,7 +1630,7 @@ begin
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if (trim(ComboBox1.Text) = '检验码单') or (trim(ComboBox1.Text) = '检验码单(公斤)') or (trim(ComboBox1.Text) = '检验码单(米数空加)') or (trim(ComboBox1.Text) = '检验码单(公斤空加)')then
|
if (trim(ComboBox1.Text) = '检验码单') or (trim(ComboBox1.Text) = '检验码单(公斤)') or (trim(ComboBox1.Text) = '检验码单(米数空加)') or (trim(ComboBox1.Text) = '检验码单(公斤空加)') then
|
||||||
begin
|
begin
|
||||||
with ADOQueryTemp do
|
with ADOQueryTemp do
|
||||||
begin
|
begin
|
||||||
|
|
@ -1674,6 +1679,31 @@ begin
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
if (trim(ComboBox1.Text) = '迦泽码单(实际米数)') then
|
||||||
|
begin
|
||||||
|
with ADOQueryTemp do
|
||||||
|
begin
|
||||||
|
Close;
|
||||||
|
sql.Clear;
|
||||||
|
sql.add('exec P_Print_CKMDYDL_M ');
|
||||||
|
sql.add('@DName=' + quotedstr(Trim(DCode)));
|
||||||
|
Open;
|
||||||
|
end;
|
||||||
|
SCreateCDS20(ADOQueryTemp, CDS_HZ);
|
||||||
|
SInitCDSData20(ADOQueryTemp, CDS_HZ);
|
||||||
|
|
||||||
|
with ADOQueryPrint do
|
||||||
|
begin
|
||||||
|
Close;
|
||||||
|
sql.Clear;
|
||||||
|
sql.add('exec P_Do_PrintMd_HZ ');
|
||||||
|
sql.add('@mainID=' + quotedstr(Trim('')));
|
||||||
|
sql.add(',@DName=' + quotedstr(Trim(DCode)));
|
||||||
|
sql.add(',@flag=''2'' ');
|
||||||
|
Open;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
if (trim(ComboBox1.Text) = '¼ìÑéÂëµ¥(Ⱦɫ)') then
|
if (trim(ComboBox1.Text) = '¼ìÑéÂëµ¥(Ⱦɫ)') then
|
||||||
begin
|
begin
|
||||||
with ADOQueryTemp do
|
with ADOQueryTemp do
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Left = 369
|
Left = 451
|
||||||
Top = 423
|
Top = 597
|
||||||
Width = 1366
|
Width = 1366
|
||||||
Height = 754
|
Height = 754
|
||||||
Caption = #25104#21697#26816#39564
|
Caption = #25104#21697#26816#39564
|
||||||
|
|
@ -2306,7 +2306,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Height = 30
|
Height = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
ButtonHeight = 30
|
ButtonHeight = 30
|
||||||
ButtonWidth = 105
|
ButtonWidth = 115
|
||||||
Caption = 'ToolBar1'
|
Caption = 'ToolBar1'
|
||||||
Color = clSkyBlue
|
Color = clSkyBlue
|
||||||
EdgeInner = esNone
|
EdgeInner = esNone
|
||||||
|
|
@ -2486,6 +2486,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
ImageIndex = 55
|
ImageIndex = 55
|
||||||
OnClick = TBCloseClick
|
OnClick = TBCloseClick
|
||||||
end
|
end
|
||||||
|
object ToolButton1: TToolButton
|
||||||
|
Left = 1022
|
||||||
|
Top = 0
|
||||||
|
Caption = #21462#28040#20462#25913
|
||||||
|
ImageIndex = 56
|
||||||
|
Visible = False
|
||||||
|
OnClick = ToolButton1Click
|
||||||
|
end
|
||||||
end
|
end
|
||||||
object Panel6: TPanel
|
object Panel6: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
|
|
@ -2717,6 +2725,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Top = 27
|
Top = 27
|
||||||
Width = 28
|
Width = 28
|
||||||
Height = 27
|
Height = 27
|
||||||
|
Enabled = False
|
||||||
Font.Charset = GB2312_CHARSET
|
Font.Charset = GB2312_CHARSET
|
||||||
Font.Color = clWindowText
|
Font.Color = clWindowText
|
||||||
Font.Height = -19
|
Font.Height = -19
|
||||||
|
|
@ -2734,6 +2743,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Top = 27
|
Top = 27
|
||||||
Width = 28
|
Width = 28
|
||||||
Height = 27
|
Height = 27
|
||||||
|
Enabled = False
|
||||||
Font.Charset = GB2312_CHARSET
|
Font.Charset = GB2312_CHARSET
|
||||||
Font.Color = clWindowText
|
Font.Color = clWindowText
|
||||||
Font.Height = -19
|
Font.Height = -19
|
||||||
|
|
|
||||||
|
|
@ -264,6 +264,7 @@ type
|
||||||
Label43: TLabel;
|
Label43: TLabel;
|
||||||
Label53: TLabel;
|
Label53: TLabel;
|
||||||
Consignee: TEdit;
|
Consignee: TEdit;
|
||||||
|
ToolButton1: TToolButton;
|
||||||
procedure FormDestroy(Sender: TObject);
|
procedure FormDestroy(Sender: TObject);
|
||||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||||
procedure TBCloseClick(Sender: TObject);
|
procedure TBCloseClick(Sender: TObject);
|
||||||
|
|
@ -322,6 +323,7 @@ type
|
||||||
procedure Timer1Timer(Sender: TObject);
|
procedure Timer1Timer(Sender: TObject);
|
||||||
procedure TBCDClick(Sender: TObject);
|
procedure TBCDClick(Sender: TObject);
|
||||||
procedure Edit5Click(Sender: TObject);
|
procedure Edit5Click(Sender: TObject);
|
||||||
|
procedure ToolButton1Click(Sender: TObject);
|
||||||
private
|
private
|
||||||
{ Private declarations }
|
{ Private declarations }
|
||||||
FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
|
FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
|
||||||
|
|
@ -1753,6 +1755,8 @@ begin
|
||||||
MJLen.SetFocus;
|
MJLen.SetFocus;
|
||||||
// MJQty4.OnClick(MJQty4);
|
// MJQty4.OnClick(MJQty4);
|
||||||
MJLen.OnClick(Mjlen);
|
MJLen.OnClick(Mjlen);
|
||||||
|
Edit7.text := '¡Ì';
|
||||||
|
Edit9.text := '¡Ì';
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
@ -2706,6 +2710,9 @@ end;
|
||||||
|
|
||||||
procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject);
|
procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
|
Edit7.Text := '';
|
||||||
|
Edit9.Text := '';
|
||||||
|
ToolButton1.Visible := True;
|
||||||
if CDS_MJID.IsEmpty then
|
if CDS_MJID.IsEmpty then
|
||||||
exit;
|
exit;
|
||||||
if CDS_MJCD.IsEmpty = False then
|
if CDS_MJCD.IsEmpty = False then
|
||||||
|
|
@ -2997,5 +3004,13 @@ begin
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TfrmMJManageNewFDNewSF.ToolButton1Click(Sender: TObject);
|
||||||
|
begin
|
||||||
|
Edit7.text := '¡Ì';
|
||||||
|
Edit9.text := '¡Ì';
|
||||||
|
APID.Text := FAPID;
|
||||||
|
Button3.Click;
|
||||||
|
end;
|
||||||
|
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
object frmOrderInPut: TfrmOrderInPut
|
object frmOrderInPut: TfrmOrderInPut
|
||||||
Left = 428
|
Left = 524
|
||||||
Top = 683
|
Top = 459
|
||||||
Width = 1379
|
Width = 1379
|
||||||
Height = 761
|
Height = 761
|
||||||
Caption = #25351#31034#21333#24405#20837
|
Caption = #25351#31034#21333#24405#20837
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user