From aff0855ee9d9b0f16af732239d1ed0d33057e893 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 21 Oct 2025 09:34:17 +0800 Subject: [PATCH] ~ --- 打卷检验管理/U_JYOrderCDOne.dfm | 32 +++++++++--- 打卷检验管理/U_JYOrderCDOne.pas | 68 ++++++++++++++++---------- 打卷检验管理/U_ProductOrderNewList.dfm | 66 +++++++++++++------------ 打卷检验管理/U_ProductOrderNewList.pas | 2 + 4 files changed, 102 insertions(+), 66 deletions(-) diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 0e445b6..d0aa42e 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 292 - Top = 527 + Left = 283 + Top = 258 Width = 1557 Height = 757 Caption = #26816#39564#25253#21578 @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1549 + Width = 1541 Height = 62 AutoSize = True ButtonHeight = 30 @@ -276,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1549 + Width = 1541 Height = 88 Align = alTop BevelInner = bvRaised @@ -603,7 +603,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnChange = PRTCodeNameChange OnKeyPress = OrderNoKeyPress end - object PRTMF: TEdit + object MJFK: TEdit Tag = 1 Left = 350 Top = 11 @@ -857,8 +857,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1549 - Height = 576 + Width = 1541 + Height = 568 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -2182,4 +2182,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 256 Top = 544 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 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 9ef3366..42cb56d 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -46,7 +46,7 @@ type OrderNo: TEdit; TBExport: TToolButton; Order_Main: TClientDataSet; - PRTMF: TEdit; + MJFK: TEdit; Label7: TLabel; Label8: TLabel; Label10: TLabel; @@ -230,6 +230,9 @@ type ADOQueryMain: TADOQuery; Label38: TLabel; MJSJKZ: TEdit; + CDS_12: TClientDataSet; + DataSource2: TDataSource; + ADOQuery1: TADOQuery; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -388,17 +391,19 @@ end; procedure TfrmJYOrderCDOne.InitGrid(); var - i: integer; + i: integer; j: Integer; begin try +// TV2.BeginUpdate(); ADOQueryMain.DisableControls; with ADOQueryMain do begin Close; Filtered := False; 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(',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),'); @@ -416,12 +421,17 @@ begin // showmessage(sql.text); Open; end; + + // SCreateCDS20(ADOQueryMain, CDS_12); +// SInitCDSData20(ADOQueryMain, CDS_12); + SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally ADOQueryMain.EnableControls; +// TV2.EndUpdate(); end; - tbfind.Click; +// tbfind.Click; end; procedure TfrmJYOrderCDOne.InitSum(); @@ -873,10 +883,14 @@ begin Close; Filtered := False; sql.Clear; - sql.Add('select A.*,'); - 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('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); +// sql.Add('select A.*,'); +// 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('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('inner join JYOrder_sub B on B.subID=A.subID '); 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', enddate.DateTime + 1) + ''' '); end; - Open; + Open; end; - SCreateCDS20(ADOQueryMain, Order_Main); + SCreateCDS20(ADOQueryMain, Order_Main); SInitCDSData20(ADOQueryMain, Order_Main); finally ADOQueryMain.EnableControls; @@ -1097,21 +1111,21 @@ procedure TfrmJYOrderCDOne.v1Column15PropertiesEditValueChanged(Sender: TObject) var mvalue: string; begin - mvalue := TcxTextEdit(Sender).EditingText; - with Order_Main do - begin - Edit; - FieldByName('PanDing').Value := Trim(mvalue); - Post; - end; - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('UPdate WFB_MJJY Set PanDing=''' + Trim(mvalue) + ''''); - SQL.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); - ExecSQL; - end; +// mvalue := TcxTextEdit(Sender).EditingText; +// with Order_Main do +// begin +// Edit; +// FieldByName('PanDing').Value := Trim(mvalue); +// Post; +// end; +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add('UPdate WFB_MJJY Set PanDing=''' + Trim(mvalue) + ''''); +// SQL.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); +// ExecSQL; +// end; end; procedure TfrmJYOrderCDOne.TCPDBClick(Sender: TObject); @@ -1557,7 +1571,7 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ռ)') then + if (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ռ)') then begin with ADOQueryTemp do begin @@ -1856,7 +1870,7 @@ begin Order_Main.DisableControls; with Order_Main do begin - First; + First; while not Eof do begin if Order_Main.FieldByName('SSel').AsBoolean = True then diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm index 0b98262..6c2f60f 100644 --- a/打卷检验管理/U_ProductOrderNewList.dfm +++ b/打卷检验管理/U_ProductOrderNewList.dfm @@ -1,6 +1,6 @@ object frmProductOrderNewList: TfrmProductOrderNewList - Left = 372 - Top = 544 + Left = 217 + Top = 219 Width = 1382 Height = 754 Caption = #21253#35013#25351#31034#21333 @@ -20,7 +20,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1374 + Width = 1349 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -125,58 +126,59 @@ object frmProductOrderNewList: TfrmProductOrderNewList AutoSize = True Caption = #23548#20986 ImageIndex = 75 + Wrap = True OnClick = TBExportClick end object TFJ: TToolButton - Left = 741 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25351#31034#21333#38468#20214 ImageIndex = 57 OnClick = TFJClick end object TBPrint: TToolButton - Left = 840 - Top = 0 + Left = 99 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = TBPrintClick end object ToolButton8: TToolButton - Left = 903 - Top = 0 + Left = 162 + Top = 30 AutoSize = True Caption = #30452#25509#25171#21360 ImageIndex = 23 OnClick = ToolButton8Click end object ToolButton4: TToolButton - Left = 990 - Top = 0 + Left = 249 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton4Click end object ToolButton5: TToolButton - Left = 1077 - Top = 0 + Left = 336 + Top = 30 Caption = #30133#28857#31649#29702 ImageIndex = 132 OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 1172 - Top = 0 + Left = 431 + Top = 30 AutoSize = True Caption = #26085#24535 ImageIndex = 72 OnClick = ToolButton6Click end object ToolButton7: TToolButton - Left = 1235 - Top = 0 + Left = 494 + Top = 30 AutoSize = True Caption = #37325#36830 ImageIndex = 73 @@ -184,8 +186,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList OnClick = ToolButton7Click end object TBClose: TToolButton - Left = 1298 - Top = 0 + Left = 557 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -194,8 +196,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1374 + Top = 62 + Width = 1349 Height = 40 Align = alTop BevelInner = bvRaised @@ -511,8 +513,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxGrid1: TcxGrid Left = 0 - Top = 95 - Width = 1374 + Top = 125 + Width = 1349 Height = 333 Align = alTop TabOrder = 3 @@ -908,8 +910,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 459 - Width = 1374 + Top = 458 + Width = 1349 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -917,8 +919,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 467 - Width = 1374 + Top = 466 + Width = 1349 Height = 256 Align = alBottom Caption = 'Panel2' @@ -926,7 +928,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 995 + Width = 970 Height = 254 Align = alClient TabOrder = 0 @@ -1253,7 +1255,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 996 + Left = 971 Top = 1 Width = 377 Height = 254 @@ -1282,8 +1284,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxTabControl1: TcxTabControl Left = 0 - Top = 72 - Width = 1374 + Top = 102 + Width = 1349 Height = 23 Align = alTop TabOrder = 2 @@ -1296,7 +1298,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1374 + ClientRectRight = 1349 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas index 74c1232..e89150e 100644 --- a/打卷检验管理/U_ProductOrderNewList.pas +++ b/打卷检验管理/U_ProductOrderNewList.pas @@ -226,6 +226,7 @@ type procedure ToolButton8Click(Sender: TObject); procedure N3Click(Sender: TObject); procedure N4Click(Sender: TObject); + private DQdate: TDateTime; FMainId: string; @@ -1266,5 +1267,6 @@ begin SelOKNoFiler(Tv1, False) end; + end.