This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-10-21 09:34:17 +08:00
parent 5d7c1572ec
commit aff0855ee9
4 changed files with 102 additions and 66 deletions

View File

@ -1,6 +1,6 @@
object frmJYOrderCDOne: TfrmJYOrderCDOne object frmJYOrderCDOne: TfrmJYOrderCDOne
Left = 292 Left = 283
Top = 527 Top = 258
Width = 1557 Width = 1557
Height = 757 Height = 757
Caption = #26816#39564#25253#21578 Caption = #26816#39564#25253#21578
@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1549 Width = 1541
Height = 62 Height = 62
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
@ -276,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 62 Top = 62
Width = 1549 Width = 1541
Height = 88 Height = 88
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -603,7 +603,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnChange = PRTCodeNameChange OnChange = PRTCodeNameChange
OnKeyPress = OrderNoKeyPress OnKeyPress = OrderNoKeyPress
end end
object PRTMF: TEdit object MJFK: TEdit
Tag = 1 Tag = 1
Left = 350 Left = 350
Top = 11 Top = 11
@ -857,8 +857,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
object cxGrid1: TcxGrid object cxGrid1: TcxGrid
Left = 0 Left = 0
Top = 150 Top = 150
Width = 1549 Width = 1541
Height = 576 Height = 568
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 3 TabOrder = 3
@ -2182,4 +2182,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Left = 256 Left = 256
Top = 544 Top = 544
end end
object CDS_12: TClientDataSet
Aggregates = <>
Params = <>
Left = 504
Top = 472
end
object DataSource2: TDataSource
DataSet = CDS_12
Left = 368
Top = 536
end
object ADOQuery1: TADOQuery
Connection = DataLink_TradeManage.ADOLink
LockType = ltReadOnly
Parameters = <>
Left = 940
Top = 540
end
end end

View File

@ -46,7 +46,7 @@ type
OrderNo: TEdit; OrderNo: TEdit;
TBExport: TToolButton; TBExport: TToolButton;
Order_Main: TClientDataSet; Order_Main: TClientDataSet;
PRTMF: TEdit; MJFK: TEdit;
Label7: TLabel; Label7: TLabel;
Label8: TLabel; Label8: TLabel;
Label10: TLabel; Label10: TLabel;
@ -230,6 +230,9 @@ type
ADOQueryMain: TADOQuery; ADOQueryMain: TADOQuery;
Label38: TLabel; Label38: TLabel;
MJSJKZ: TEdit; MJSJKZ: TEdit;
CDS_12: TClientDataSet;
DataSource2: TDataSource;
ADOQuery1: TADOQuery;
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
@ -388,17 +391,19 @@ end;
procedure TfrmJYOrderCDOne.InitGrid(); procedure TfrmJYOrderCDOne.InitGrid();
var var
i: integer; i: integer;
j: Integer; j: Integer;
begin begin
try try
// TV2.BeginUpdate();
ADOQueryMain.DisableControls; ADOQueryMain.DisableControls;
with ADOQueryMain do with ADOQueryMain do
begin begin
Close; Close;
Filtered := False; Filtered := False;
sql.Clear; sql.Clear;
sql.Add('select A.*,'); sql.Add('select A.mainid,A.subid,A.BaoNo,A.BaoId,A.MJstr4,A.MJXH,A.MJID,A.MJQty4,A.MJMaoZ,A.MJLen,A.MJTypeOther,A.MJQty2,A.Filler,A.Filltime ');
sql.Add(',A.MJSJKZ,A.MJSJKZ,A.CKFlag,A.Note,A.MJStr5,A.CDList,A.HXFlag,');
SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno');
sql.Add(',C.CustomerNoName,C.OrderNo,B.PRTCodeName,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PIH'); sql.Add(',C.CustomerNoName,C.OrderNo,B.PRTCodeName,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PIH');
// sql.Add(',KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); // sql.Add(',KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),');
@ -416,12 +421,17 @@ begin
// showmessage(sql.text); // showmessage(sql.text);
Open; Open;
end; end;
// SCreateCDS20(ADOQueryMain, CDS_12);
// SInitCDSData20(ADOQueryMain, CDS_12);
SCreateCDS20(ADOQueryMain, Order_Main); SCreateCDS20(ADOQueryMain, Order_Main);
SInitCDSData20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main);
finally finally
ADOQueryMain.EnableControls; ADOQueryMain.EnableControls;
// TV2.EndUpdate();
end; end;
tbfind.Click; // tbfind.Click;
end; end;
procedure TfrmJYOrderCDOne.InitSum(); procedure TfrmJYOrderCDOne.InitSum();
@ -873,10 +883,14 @@ begin
Close; Close;
Filtered := False; Filtered := False;
sql.Clear; sql.Clear;
sql.Add('select A.*,'); // sql.Add('select A.*,');
sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); // sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,');
sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); // sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),');
sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); // sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)');
sql.Add('select A.mainid,A.subid,A.BaoNo,A.BaoId,A.MJstr4,A.MJXH,A.MJID,A.MJQty4,A.MJMaoZ,A.MJLen,A.MJTypeOther,A.MJQty2,A.Filler,A.Filltime ');
sql.Add(',A.MJSJKZ,A.MJSJKZ,A.CKFlag,A.Note,A.MJStr5,A.CDList,A.HXFlag,');
SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno');
sql.Add(',C.CustomerNoName,C.OrderNo,B.PRTCodeName,B.PRTColor,B.SOrddefstr1,B.SOrddefstr4,B.prthx,B.KHorderNo,B.PIH');
SQL.Add('from WFB_MJJY A'); SQL.Add('from WFB_MJJY A');
sql.Add('inner join JYOrder_sub B on B.subID=A.subID '); sql.Add('inner join JYOrder_sub B on B.subID=A.subID ');
sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID '); sql.Add('inner join JYOrder_Main C on C.MainID=A.MainID ');
@ -886,9 +900,9 @@ begin
sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' '); sql.Add('and A.FillTime>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''' ');
sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' '); sql.Add('and A.FillTime<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
end; end;
Open; Open;
end; end;
SCreateCDS20(ADOQueryMain, Order_Main); SCreateCDS20(ADOQueryMain, Order_Main);
SInitCDSData20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main);
finally finally
ADOQueryMain.EnableControls; ADOQueryMain.EnableControls;
@ -1097,21 +1111,21 @@ procedure TfrmJYOrderCDOne.v1Column15PropertiesEditValueChanged(Sender: TObject)
var var
mvalue: string; mvalue: string;
begin begin
mvalue := TcxTextEdit(Sender).EditingText; // mvalue := TcxTextEdit(Sender).EditingText;
with Order_Main do // with Order_Main do
begin // begin
Edit; // Edit;
FieldByName('PanDing').Value := Trim(mvalue); // FieldByName('PanDing').Value := Trim(mvalue);
Post; // Post;
end; // end;
with ADOQueryCmd do // with ADOQueryCmd do
begin // begin
Close; // Close;
sql.Clear; // sql.Clear;
sql.Add('UPdate WFB_MJJY Set PanDing=''' + Trim(mvalue) + ''''); // sql.Add('UPdate WFB_MJJY Set PanDing=''' + Trim(mvalue) + '''');
SQL.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); // SQL.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
ExecSQL; // ExecSQL;
end; // end;
end; end;
procedure TfrmJYOrderCDOne.TCPDBClick(Sender: TObject); procedure TfrmJYOrderCDOne.TCPDBClick(Sender: TObject);
@ -1557,7 +1571,7 @@ begin
Open; Open;
end; end;
end; end;
if (trim(ComboBox1.Text) = '检验码单(中文)') or (trim(ComboBox1.Text) = '检验码单(空加)') then if (trim(ComboBox1.Text) = '检验码单(中文)') or (trim(ComboBox1.Text) = '检验码单(空加)') then
begin begin
with ADOQueryTemp do with ADOQueryTemp do
begin begin
@ -1856,7 +1870,7 @@ begin
Order_Main.DisableControls; Order_Main.DisableControls;
with Order_Main do with Order_Main do
begin begin
First; First;
while not Eof do while not Eof do
begin begin
if Order_Main.FieldByName('SSel').AsBoolean = True then if Order_Main.FieldByName('SSel').AsBoolean = True then

View File

@ -1,6 +1,6 @@
object frmProductOrderNewList: TfrmProductOrderNewList object frmProductOrderNewList: TfrmProductOrderNewList
Left = 372 Left = 217
Top = 544 Top = 219
Width = 1382 Width = 1382
Height = 754 Height = 754
Caption = #21253#35013#25351#31034#21333 Caption = #21253#35013#25351#31034#21333
@ -20,7 +20,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1374 Width = 1349
Height = 62
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 95 ButtonWidth = 95
@ -125,58 +126,59 @@ object frmProductOrderNewList: TfrmProductOrderNewList
AutoSize = True AutoSize = True
Caption = #23548#20986 Caption = #23548#20986
ImageIndex = 75 ImageIndex = 75
Wrap = True
OnClick = TBExportClick OnClick = TBExportClick
end end
object TFJ: TToolButton object TFJ: TToolButton
Left = 741 Left = 0
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25351#31034#21333#38468#20214 Caption = #25351#31034#21333#38468#20214
ImageIndex = 57 ImageIndex = 57
OnClick = TFJClick OnClick = TFJClick
end end
object TBPrint: TToolButton object TBPrint: TToolButton
Left = 840 Left = 99
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360 Caption = #25171#21360
ImageIndex = 12 ImageIndex = 12
OnClick = TBPrintClick OnClick = TBPrintClick
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 903 Left = 162
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #30452#25509#25171#21360 Caption = #30452#25509#25171#21360
ImageIndex = 23 ImageIndex = 23
OnClick = ToolButton8Click OnClick = ToolButton8Click
end end
object ToolButton4: TToolButton object ToolButton4: TToolButton
Left = 990 Left = 249
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #24322#24120#25968#25454 Caption = #24322#24120#25968#25454
ImageIndex = 2 ImageIndex = 2
OnClick = ToolButton4Click OnClick = ToolButton4Click
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 1077 Left = 336
Top = 0 Top = 30
Caption = #30133#28857#31649#29702 Caption = #30133#28857#31649#29702
ImageIndex = 132 ImageIndex = 132
OnClick = ToolButton5Click OnClick = ToolButton5Click
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 1172 Left = 431
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #26085#24535 Caption = #26085#24535
ImageIndex = 72 ImageIndex = 72
OnClick = ToolButton6Click OnClick = ToolButton6Click
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 1235 Left = 494
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #37325#36830 Caption = #37325#36830
ImageIndex = 73 ImageIndex = 73
@ -184,8 +186,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
OnClick = ToolButton7Click OnClick = ToolButton7Click
end end
object TBClose: TToolButton object TBClose: TToolButton
Left = 1298 Left = 557
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #20851#38381 Caption = #20851#38381
ImageIndex = 55 ImageIndex = 55
@ -194,8 +196,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 32 Top = 62
Width = 1374 Width = 1349
Height = 40 Height = 40
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -511,8 +513,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
object cxGrid1: TcxGrid object cxGrid1: TcxGrid
Left = 0 Left = 0
Top = 95 Top = 125
Width = 1374 Width = 1349
Height = 333 Height = 333
Align = alTop Align = alTop
TabOrder = 3 TabOrder = 3
@ -908,8 +910,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
object cxSplitter1: TcxSplitter object cxSplitter1: TcxSplitter
Left = 0 Left = 0
Top = 459 Top = 458
Width = 1374 Width = 1349
Height = 8 Height = 8
HotZoneClassName = 'TcxMediaPlayer9Style' HotZoneClassName = 'TcxMediaPlayer9Style'
AlignSplitter = salBottom AlignSplitter = salBottom
@ -917,8 +919,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Top = 467 Top = 466
Width = 1374 Width = 1349
Height = 256 Height = 256
Align = alBottom Align = alBottom
Caption = 'Panel2' Caption = 'Panel2'
@ -926,7 +928,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
object cxGrid2: TcxGrid object cxGrid2: TcxGrid
Left = 1 Left = 1
Top = 1 Top = 1
Width = 995 Width = 970
Height = 254 Height = 254
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
@ -1253,7 +1255,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
end end
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 996 Left = 971
Top = 1 Top = 1
Width = 377 Width = 377
Height = 254 Height = 254
@ -1282,8 +1284,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList
end end
object cxTabControl1: TcxTabControl object cxTabControl1: TcxTabControl
Left = 0 Left = 0
Top = 72 Top = 102
Width = 1374 Width = 1349
Height = 23 Height = 23
Align = alTop Align = alTop
TabOrder = 2 TabOrder = 2
@ -1296,7 +1298,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList
#20840#37096) #20840#37096)
OnChange = cxTabControl1Change OnChange = cxTabControl1Change
ClientRectBottom = 23 ClientRectBottom = 23
ClientRectRight = 1374 ClientRectRight = 1349
ClientRectTop = 19 ClientRectTop = 19
end end
object cxGridPopupMenu1: TcxGridPopupMenu object cxGridPopupMenu1: TcxGridPopupMenu

View File

@ -226,6 +226,7 @@ type
procedure ToolButton8Click(Sender: TObject); procedure ToolButton8Click(Sender: TObject);
procedure N3Click(Sender: TObject); procedure N3Click(Sender: TObject);
procedure N4Click(Sender: TObject); procedure N4Click(Sender: TObject);
private private
DQdate: TDateTime; DQdate: TDateTime;
FMainId: string; FMainId: string;
@ -1266,5 +1267,6 @@ begin
SelOKNoFiler(Tv1, False) SelOKNoFiler(Tv1, False)
end; end;
end. end.