~
This commit is contained in:
parent
2d92c56ed4
commit
b4f79cb188
|
|
@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 87
|
Top = 87
|
||||||
Width = 345
|
Width = 345
|
||||||
Height = 636
|
Height = 628
|
||||||
Align = alLeft
|
Align = alLeft
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
object Tv3: TcxGridDBTableView
|
object Tv3: TcxGridDBTableView
|
||||||
|
|
@ -137,8 +137,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
object ScrollBox1: TScrollBox
|
object ScrollBox1: TScrollBox
|
||||||
Left = 633
|
Left = 633
|
||||||
Top = 87
|
Top = 87
|
||||||
Width = 725
|
Width = 717
|
||||||
Height = 636
|
Height = 628
|
||||||
Align = alClient
|
Align = alClient
|
||||||
Color = clWhite
|
Color = clWhite
|
||||||
ParentColor = False
|
ParentColor = False
|
||||||
|
|
@ -989,7 +989,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Left = 409
|
Left = 409
|
||||||
Top = 87
|
Top = 87
|
||||||
Width = 224
|
Width = 224
|
||||||
Height = 636
|
Height = 628
|
||||||
Align = alLeft
|
Align = alLeft
|
||||||
BevelInner = bvRaised
|
BevelInner = bvRaised
|
||||||
BevelOuter = bvLowered
|
BevelOuter = bvLowered
|
||||||
|
|
@ -2108,7 +2108,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Left = 345
|
Left = 345
|
||||||
Top = 87
|
Top = 87
|
||||||
Width = 64
|
Width = 64
|
||||||
Height = 636
|
Height = 628
|
||||||
Align = alLeft
|
Align = alLeft
|
||||||
BevelInner = bvRaised
|
BevelInner = bvRaised
|
||||||
BevelOuter = bvLowered
|
BevelOuter = bvLowered
|
||||||
|
|
@ -2117,7 +2117,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 2
|
Top = 2
|
||||||
Width = 60
|
Width = 60
|
||||||
Height = 311
|
Height = 303
|
||||||
Align = alClient
|
Align = alClient
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
object Tv2: TcxGridDBTableView
|
object Tv2: TcxGridDBTableView
|
||||||
|
|
@ -2225,7 +2225,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
end
|
end
|
||||||
object Panel8: TPanel
|
object Panel8: TPanel
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 313
|
Top = 305
|
||||||
Width = 60
|
Width = 60
|
||||||
Height = 28
|
Height = 28
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
|
|
@ -2240,7 +2240,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
end
|
end
|
||||||
object AOrdDefNote1: TRichEdit
|
object AOrdDefNote1: TRichEdit
|
||||||
Left = 2
|
Left = 2
|
||||||
Top = 341
|
Top = 333
|
||||||
Width = 60
|
Width = 60
|
||||||
Height = 293
|
Height = 293
|
||||||
Align = alBottom
|
Align = alBottom
|
||||||
|
|
@ -2467,7 +2467,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
object ToolBar1: TToolBar
|
object ToolBar1: TToolBar
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 1358
|
Width = 1350
|
||||||
Height = 30
|
Height = 30
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
ButtonHeight = 30
|
ButtonHeight = 30
|
||||||
|
|
@ -2655,7 +2655,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
||||||
object Panel6: TPanel
|
object Panel6: TPanel
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 30
|
Top = 30
|
||||||
Width = 1358
|
Width = 1350
|
||||||
Height = 57
|
Height = 57
|
||||||
Align = alTop
|
Align = alTop
|
||||||
BevelInner = bvRaised
|
BevelInner = bvRaised
|
||||||
|
|
|
||||||
|
|
@ -2465,7 +2465,7 @@ begin
|
||||||
Close;
|
Close;
|
||||||
sql.Clear;
|
sql.Clear;
|
||||||
sql.Add('select B.*,B.OrderNo OrderNoM,C.*, ');
|
sql.Add('select B.*,B.OrderNo OrderNoM,C.*, ');
|
||||||
sql.Add('MJJH=(select MJJH from WFB_MJJY X where X.SubID=C.subID),');
|
// sql.Add('MJJH=(select MJJH from WFB_MJJY X where X.SubID=C.subID),');
|
||||||
sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),');
|
sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),');
|
||||||
sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),');
|
sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),');
|
||||||
// sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
|
// sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
|
||||||
|
|
@ -2475,6 +2475,7 @@ begin
|
||||||
sql.Add('from JYOrder_Sub C');
|
sql.Add('from JYOrder_Sub C');
|
||||||
SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
|
SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
|
||||||
sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
|
sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
|
||||||
|
// ShowMessage(sql.text);
|
||||||
Open;
|
Open;
|
||||||
end;
|
end;
|
||||||
if ADOTmp.IsEmpty = False then
|
if ADOTmp.IsEmpty = False then
|
||||||
|
|
@ -2528,7 +2529,7 @@ begin
|
||||||
kmxs.Text := Trim(ADOTmp.fieldbyname('kmxs').AsString);
|
kmxs.Text := Trim(ADOTmp.fieldbyname('kmxs').AsString);
|
||||||
MJFK.Text := Trim(ADOTmp.fieldbyname('PRTMF').AsString);
|
MJFK.Text := Trim(ADOTmp.fieldbyname('PRTMF').AsString);
|
||||||
MJSJKZ.Text := Trim(ADOTmp.fieldbyname('PRTKZ').AsString);
|
MJSJKZ.Text := Trim(ADOTmp.fieldbyname('PRTKZ').AsString);
|
||||||
MJJH.Text:=Trim(ADOTmp.fieldbyname('MJJH').asstring);
|
// MJJH.Text:=Trim(ADOTmp.fieldbyname('MJJH').asstring);
|
||||||
if edit10.Text = '' then
|
if edit10.Text = '' then
|
||||||
begin
|
begin
|
||||||
MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1);
|
MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1);
|
||||||
|
|
@ -2780,6 +2781,7 @@ begin
|
||||||
MJLen.Text := Trim(ADOTmp.fieldbyname('MJLen').AsString);
|
MJLen.Text := Trim(ADOTmp.fieldbyname('MJLen').AsString);
|
||||||
MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString);
|
MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString);
|
||||||
MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
|
MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
|
||||||
|
MJXH.Text := Trim(ADOTmp.fieldbyname('MJJH').AsString);
|
||||||
baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
|
baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
|
||||||
baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
|
baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
|
||||||
if Trim(ADOTmp.fieldbyname('MJType').AsString) = 'ÕýÆ·' then
|
if Trim(ADOTmp.fieldbyname('MJType').AsString) = 'ÕýÆ·' then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user