回滚9.1

This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-09-28 16:06:19 +08:00
parent 5527f83e2a
commit 8ba470de3c
4 changed files with 35 additions and 44 deletions

View File

@ -101,7 +101,7 @@ DebugSourceDirs=
UsePackages=0 UsePackages=0
[Parameters] [Parameters]
RunParams= RunParams=
HostApplication=D:\淃커덜쯤\D7szChenfeng\虔廉셕뺍데(ShuttleSchedule.dll)\testDll.exe HostApplication=E:\淃커栗죕\02_虔廉낍\냈료\D7szChenfeng\虔廉셕뺍데(ShuttleSchedule.dll)\testDll.exe
Launcher= Launcher=
UseLauncher=0 UseLauncher=0
DebugCWD= DebugCWD=

View File

@ -1,7 +1,7 @@
[ExpressSkins] [ExpressSkins]
Default=1 Default=1
ShowNotifications=1 ShowNotifications=1
Enabled=0 Enabled=1
dxSkinBlack=1 dxSkinBlack=1
dxSkinBlue=1 dxSkinBlue=1
dxSkinBlueprint=1 dxSkinBlueprint=1

View File

@ -1,6 +1,6 @@
object frmClothSCInPut: TfrmClothSCInPut object frmClothSCInPut: TfrmClothSCInPut
Left = 497 Left = 246
Top = 342 Top = 71
Width = 1474 Width = 1474
Height = 760 Height = 760
Align = alClient Align = alClient
@ -19,7 +19,7 @@ object frmClothSCInPut: TfrmClothSCInPut
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1466 Width = 1458
Height = 29 Height = 29
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 95 ButtonWidth = 95
@ -65,7 +65,7 @@ object frmClothSCInPut: TfrmClothSCInPut
object ScrollBox1: TScrollBox object ScrollBox1: TScrollBox
Left = 0 Left = 0
Top = 29 Top = 29
Width = 1466 Width = 1458
Height = 416 Height = 416
Align = alTop Align = alTop
BevelInner = bvNone BevelInner = bvNone
@ -1273,8 +1273,8 @@ object frmClothSCInPut: TfrmClothSCInPut
object cxPageControl1: TcxPageControl object cxPageControl1: TcxPageControl
Left = 0 Left = 0
Top = 474 Top = 474
Width = 1466 Width = 1458
Height = 255 Height = 247
Align = alClient Align = alClient
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -1283,12 +1283,12 @@ object frmClothSCInPut: TfrmClothSCInPut
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
Properties.ActivePage = cxTabSheet3 Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <> Properties.CustomButtons.Buttons = <>
Properties.Style = 9 Properties.Style = 9
OnChange = cxPageControl1Change OnChange = cxPageControl1Change
ClientRectBottom = 255 ClientRectBottom = 247
ClientRectRight = 1466 ClientRectRight = 1458
ClientRectTop = 23 ClientRectTop = 23
object cxTabSheet1: TcxTabSheet object cxTabSheet1: TcxTabSheet
Caption = #32463#19997#32452#21512 Caption = #32463#19997#32452#21512
@ -1296,8 +1296,8 @@ object frmClothSCInPut: TfrmClothSCInPut
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 980 Left = 980
Top = 0 Top = 0
Width = 486 Width = 478
Height = 232 Height = 224
Align = alClient Align = alClient
Caption = #32463#25490#21015 Caption = #32463#25490#21015
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -1311,8 +1311,8 @@ object frmClothSCInPut: TfrmClothSCInPut
Tag = 2 Tag = 2
Left = 2 Left = 2
Top = 31 Top = 31
Width = 482 Width = 474
Height = 199 Height = 191
Align = alClient Align = alClient
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -1327,7 +1327,7 @@ object frmClothSCInPut: TfrmClothSCInPut
Left = 0 Left = 0
Top = 0 Top = 0
Width = 980 Width = 980
Height = 232 Height = 224
Align = alLeft Align = alLeft
TabOrder = 1 TabOrder = 1
object TV1: TcxGridDBTableView object TV1: TcxGridDBTableView
@ -1423,8 +1423,8 @@ object frmClothSCInPut: TfrmClothSCInPut
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 980 Left = 980
Top = 0 Top = 0
Width = 486 Width = 530
Height = 232 Height = 281
Align = alClient Align = alClient
Caption = #32428#25490#21015 Caption = #32428#25490#21015
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -1438,8 +1438,8 @@ object frmClothSCInPut: TfrmClothSCInPut
Tag = 2 Tag = 2
Left = 2 Left = 2
Top = 31 Top = 31
Width = 482 Width = 526
Height = 199 Height = 248
Align = alClient Align = alClient
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -1454,7 +1454,7 @@ object frmClothSCInPut: TfrmClothSCInPut
Left = 0 Left = 0
Top = 0 Top = 0
Width = 980 Width = 980
Height = 232 Height = 281
Align = alLeft Align = alLeft
TabOrder = 1 TabOrder = 1
object TV2: TcxGridDBTableView object TV2: TcxGridDBTableView
@ -1549,8 +1549,8 @@ object frmClothSCInPut: TfrmClothSCInPut
object ScrollBox2: TScrollBox object ScrollBox2: TScrollBox
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1466 Width = 1458
Height = 232 Height = 224
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
object Label11: TLabel object Label11: TLabel
@ -2525,8 +2525,8 @@ object frmClothSCInPut: TfrmClothSCInPut
object cxGrid4: TcxGrid object cxGrid4: TcxGrid
Left = 0 Left = 0
Top = 41 Top = 41
Width = 1466 Width = 1458
Height = 191 Height = 183
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 0 TabOrder = 0
@ -2607,7 +2607,7 @@ object frmClothSCInPut: TfrmClothSCInPut
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1466 Width = 1458
Height = 41 Height = 41
Align = alTop Align = alTop
TabOrder = 1 TabOrder = 1
@ -2674,7 +2674,7 @@ object frmClothSCInPut: TfrmClothSCInPut
Properties.ShowFocusRect = False Properties.ShowFocusRect = False
Style.BorderStyle = ebsSingle Style.BorderStyle = ebsSingle
TabOrder = 0 TabOrder = 0
Height = 211 Height = 203
Width = 481 Width = 481
end end
object YWBian: TMemo object YWBian: TMemo
@ -2682,7 +2682,7 @@ object frmClothSCInPut: TfrmClothSCInPut
Left = 701 Left = 701
Top = 0 Top = 0
Width = 794 Width = 794
Height = 211 Height = 203
Align = alRight Align = alRight
TabOrder = 1 TabOrder = 1
end end
@ -2692,7 +2692,7 @@ object frmClothSCInPut: TfrmClothSCInPut
object ToolBar2: TToolBar object ToolBar2: TToolBar
Left = 0 Left = 0
Top = 445 Top = 445
Width = 1466 Width = 1458
Height = 29 Height = 29
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 59 ButtonWidth = 59

View File

@ -582,7 +582,7 @@ begin
SQL.Clear; SQL.Clear;
sql.Add(' select A.*,B.* from PD_GY_Main A inner join PD_GY_Sub B on A.MainId=B.MainId'); sql.Add(' select A.*,B.* from PD_GY_Main A inner join PD_GY_Sub B on A.MainId=B.MainId');
sql.Add(' where A.ORDERNO=' + Quotedstr(Trim(GYNO.Text))); sql.Add(' where A.MainId=' + Quotedstr(Trim(FGYNO)));
//ShowMessage(SQL.Text); //ShowMessage(SQL.Text);
Open; Open;
@ -621,7 +621,7 @@ begin
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.Add('select * from PD_GY_QZ A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where ORDERNO=''' + Trim(GYNO.Text) + ''''); sql.Add('select * from PD_GY_QZ where MainId=''' + Trim(FGYNO) + '''');
Open; Open;
end; end;
SCreateCDS20(ADOQueryTemp, CDS_QZ); SCreateCDS20(ADOQueryTemp, CDS_QZ);
@ -632,7 +632,7 @@ begin
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.Add('select * from PD_GY_Yarn A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where PYType=''¾­Ë¿'' and ORDERNO=''' + Trim(GYNO.Text) + ''''); sql.Add('select * from PD_GY_Yarn where PYType=''¾­Ë¿'' and MainId=''' + Trim(FGYNO) + '''');
Open; Open;
end; end;
SCreateCDS20(ADOQueryTemp, CDS_YarnJX); SCreateCDS20(ADOQueryTemp, CDS_YarnJX);
@ -646,7 +646,7 @@ begin
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.Add('select * from PD_GY_Yarn A LEFT JOIN PD_GY_Main B on A.MainId=B.MainId where PYType=''γ˿'' and ORDERNO=''' + Trim(GYNO.Text) + ''''); sql.Add('select * from PD_GY_Yarn where PYType=''γ˿'' and MainId=''' + Trim(FGYNO) + '''');
Open; Open;
end; end;
SCreateCDS20(ADOQueryTemp, CDS_YarnWX); SCreateCDS20(ADOQueryTemp, CDS_YarnWX);
@ -775,11 +775,9 @@ begin
sql.Add('select * from PD_Plan_Yarn where PYType=''¾­Ë¿'' and MainId=''' + Trim(FMainId) + ''''); sql.Add('select * from PD_Plan_Yarn where PYType=''¾­Ë¿'' and MainId=''' + Trim(FMainId) + '''');
Open; Open;
end; end;
Y_Note_PLJ.Text := Trim(ADOQueryTemp.FieldByName('Y_Note_PL').AsString);
SCreateCDS20(ADOQueryTemp, CDS_YarnJX); SCreateCDS20(ADOQueryTemp, CDS_YarnJX);
SInitCDSData20(ADOQueryTemp, CDS_YarnJX); SInitCDSData20(ADOQueryTemp, CDS_YarnJX);
Y_Note_PLJ.Text := Trim(ADOQueryTemp.FieldByName('Y_Note_PL').AsString);
if PState = 0 then if PState = 0 then
begin begin
with CDS_YarnJX do with CDS_YarnJX do
@ -932,13 +930,6 @@ procedure TfrmClothSCInPut.FormShow(Sender: TObject);
begin begin
ToolBar2.Visible := False; ToolBar2.Visible := False;
InitData(); InitData();
if PState = 1 then
begin
FGYNO := GYNO.Text;
INITGY();
end;
InitImage(); InitImage();
// Y_Note_PLW.SelectAll; // Y_Note_PLW.SelectAll;
// RichEditLineSpacing(Y_Note_PLW, 0); // RichEditLineSpacing(Y_Note_PLW, 0);