Revert "123456789"

This reverts commit b467e112c1.
This commit is contained in:
ZhangQingYue 2025-06-09 14:44:15 +08:00
parent b467e112c1
commit ef52eaac7f
3 changed files with 21 additions and 18 deletions

View File

@ -2,7 +2,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
Left = 372 Left = 372
Top = 106 Top = 106
Caption = #21512#21516#32433#32447#36873#25321 Caption = #21512#21516#32433#32447#36873#25321
ClientHeight = 548 ClientHeight = 558
ClientWidth = 1540 ClientWidth = 1540
Color = clWhite Color = clWhite
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -10,9 +10,9 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
Font.Name = #23435#20307 Font.Name = #23435#20307
Position = poScreenCenter Position = poScreenCenter
OnClose = FormClose OnClose = FormClose
ExplicitLeft = -689 ExplicitLeft = -551
ExplicitWidth = 1556 ExplicitWidth = 1556
ExplicitHeight = 587 ExplicitHeight = 597
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 12 TextHeight = 12
object ToolBar1: TToolBar [0] object ToolBar1: TToolBar [0]
@ -37,6 +37,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
ParentFont = False ParentFont = False
ShowCaptions = True ShowCaptions = True
TabOrder = 0 TabOrder = 0
ExplicitTop = 5
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 0 Left = 0
Top = 0 Top = 0
@ -71,6 +72,7 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
TabOrder = 1 TabOrder = 1
ExplicitTop = 32
object Label1: TLabel object Label1: TLabel
Left = 18 Left = 18
Top = 15 Top = 15
@ -124,12 +126,12 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
Left = 0 Left = 0
Top = 82 Top = 82
Width = 1540 Width = 1540
Height = 466 Height = 476
Align = alClient Align = alClient
BorderStyle = cxcbsNone BorderStyle = cxcbsNone
PopupMenu = PM_1 PopupMenu = PM_1
TabOrder = 2 TabOrder = 2
ExplicitHeight = 476 ExplicitTop = 88
object TV1: TcxGridDBTableView object TV1: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <> Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <> ScrollbarAnnotations.CustomAnnotations = <>
@ -314,6 +316,14 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
Options.Editing = False Options.Editing = False
Width = 100 Width = 100
end end
object TV1Column16: TcxGridDBColumn
Caption = #32433#32447#24211#23384
DataBinding.FieldName = 'KCQty'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 100
end
object TV1Column4: TcxGridDBColumn object TV1Column4: TcxGridDBColumn
Caption = #24050#39046#29992#25968#37327 Caption = #24050#39046#29992#25968#37327
DataBinding.FieldName = 'LYQty' DataBinding.FieldName = 'LYQty'
@ -323,14 +333,6 @@ inherited frmSalesContract_ZZDSXSel: TfrmSalesContract_ZZDSXSel
HeaderAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter
Width = 99 Width = 99
end end
object TV1Column16: TcxGridDBColumn
Caption = #32433#32447#24211#23384
DataBinding.FieldName = 'KCQty'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 100
end
end end
object cxGridLevel1: TcxGridLevel object cxGridLevel1: TcxGridLevel
GridView = TV1 GridView = TV1

View File

@ -168,12 +168,13 @@ begin
SQL.Add('SELECT A.*,B.*,C.*'); SQL.Add('SELECT A.*,B.*,C.*');
SQL.Add(' ,SXQty=round(OrdQty*C.MeterQty/1000,2)'); SQL.Add(' ,SXQty=round(OrdQty*C.MeterQty/1000,2)');
SQL.Add(' ,LYQTY = (SELECT SUM(QTY) FROM Bs_Yarn_IO X ');
SQL.Add('WHERE X.ToOrdNo = A.OrderNo AND IOFlag = ''出库'')');
SQL.Add(' ,SQQty=(select Sum(Y.Qty) from Pur_YarnPlan_Main X '); SQL.Add(' ,SQQty=(select Sum(Y.Qty) from Pur_YarnPlan_Main X ');
SQL.Add('INNER JOIN Pur_YarnPlan_Sub Y on X.PurMId =Y.PurMId '); SQL.Add('INNER JOIN Pur_YarnPlan_Sub Y on X.PurMId =Y.PurMId ');
SQL.Add('where isnull(X.LX,'''') = ''Ö¯Ôìµ¥'' and X.OrderNo =A.OrderNo and '); SQL.Add('where isnull(X.LX,'''') = ''Ö¯Ôìµ¥'' and X.OrderNo =A.OrderNo and ');
SQL.Add('isnull(X.status,''0'')=''-1'') '); SQL.Add('isnull(X.status,''0'')=''-1'') ');
sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.Mainid=B.MainId'); sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.Mainid=B.MainId');
sql.Add(' inner join Tat_Plan_Yarn C on A.Mainid=C.MainId'); sql.Add(' inner join Tat_Plan_Yarn C on A.Mainid=C.MainId');
SQL.Add('WHERE A.Status = ''9'' and C.Y_Code <> '''' '); SQL.Add('WHERE A.Status = ''9'' and C.Y_Code <> '''' ');

View File

@ -10,7 +10,6 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
OldCreateOrder = True OldCreateOrder = True
Position = poScreenCenter Position = poScreenCenter
WindowState = wsMaximized WindowState = wsMaximized
ExplicitLeft = -572
ExplicitWidth = 1540 ExplicitWidth = 1540
ExplicitHeight = 690 ExplicitHeight = 690
PixelsPerInch = 96 PixelsPerInch = 96
@ -116,6 +115,7 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
Align = alClient Align = alClient
BorderStyle = cxcbsNone BorderStyle = cxcbsNone
TabOrder = 2 TabOrder = 2
ExplicitLeft = -6
ExplicitTop = 183 ExplicitTop = 183
object Tv1: TcxGridDBTableView object Tv1: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <> Navigator.Buttons.CustomButtons = <>
@ -569,8 +569,8 @@ inherited frmYarnPurchasePlanPut_ZZD: TfrmYarnPurchasePlanPut_ZZD
end end
object OrderNo: TcxButtonEdit object OrderNo: TcxButtonEdit
Tag = 2 Tag = 2
Left = 803 Left = 801
Top = 6 Top = 5
Properties.Buttons = < Properties.Buttons = <
item item
Default = True Default = True