From 1ce4511ece932b92967b21cf0576d293deb80678 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 30 Apr 2026 19:07:49 +0800 Subject: [PATCH] 20260430 --- 打卷检验管理/TradeManage.dof | 2 +- 打卷检验管理/TradeManage.skincfg | 50 +++++++ 打卷检验管理/U_DataLink.pas | 16 ++- 打卷检验管理/U_JYOrderCDOne.dfm | 103 ++++++++------ 打卷检验管理/U_JYOrderCDOne.pas | 173 +++++++++++++++++++---- 打卷检验管理/U_MJManageNewFDNew.dfm | 184 +++++++++++++++++-------- 打卷检验管理/U_MJManageNewFDNew.pas | 13 ++ 打卷检验管理/U_ProductOrderNewList.dfm | 22 +-- 打卷检验管理/U_ProductOrderNewList.pas | 15 +- 9 files changed, 445 insertions(+), 133 deletions(-) create mode 100644 打卷检验管理/TradeManage.skincfg diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index 8e398f0..4c964dc 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJqixin\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/TradeManage.skincfg b/打卷检验管理/TradeManage.skincfg new file mode 100644 index 0000000..89edbfe --- /dev/null +++ b/打卷检验管理/TradeManage.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinBlack=1 +dxSkinBlue=1 +dxSkinBlueprint=1 +dxSkinCaramel=1 +dxSkinCoffee=1 +dxSkinDarkRoom=1 +dxSkinDarkSide=1 +dxSkinDevExpressDarkStyle=1 +dxSkinDevExpressStyle=1 +dxSkinFoggy=1 +dxSkinGlassOceans=1 +dxSkinHighContrast=1 +dxSkiniMaginary=1 +dxSkinLilian=1 +dxSkinLiquidSky=1 +dxSkinLondonLiquidSky=1 +dxSkinMcSkin=1 +dxSkinMetropolis=1 +dxSkinMetropolisDark=1 +dxSkinMoneyTwins=1 +dxSkinOffice2007Black=1 +dxSkinOffice2007Blue=1 +dxSkinOffice2007Green=1 +dxSkinOffice2007Pink=1 +dxSkinOffice2007Silver=1 +dxSkinOffice2010Black=1 +dxSkinOffice2010Blue=1 +dxSkinOffice2010Silver=1 +dxSkinOffice2013DarkGray=1 +dxSkinOffice2013LightGray=1 +dxSkinOffice2013White=1 +dxSkinPumpkin=1 +dxSkinSeven=1 +dxSkinSevenClassic=1 +dxSkinSharp=1 +dxSkinSharpPlus=1 +dxSkinSilver=1 +dxSkinSpringTime=1 +dxSkinStardust=1 +dxSkinSummer2008=1 +dxSkinTheAsphaltWorld=1 +dxSkinsDefaultPainters=1 +dxSkinValentine=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/打卷检验管理/U_DataLink.pas b/打卷检验管理/U_DataLink.pas index e53b287..4c58cd6 100644 --- a/打卷检验管理/U_DataLink.pas +++ b/打卷检验管理/U_DataLink.pas @@ -4,7 +4,21 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, - Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs; + Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, ExtCtrls,SyncObjs, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, + dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue; type TMyThread = class(TThread) protected diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index b93c076..af8bf9b 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -21,8 +21,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1384 - Height = 92 + Width = 1392 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -101,28 +101,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 - Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 0 - Top = 30 + Left = 608 + Top = 0 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 111 - Top = 30 + Left = 719 + Top = 0 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 222 - Top = 30 + Left = 830 + Top = 0 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -130,23 +129,31 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 345 - Top = 30 + Left = 953 + Top = 0 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end + object ToolButton14: TToolButton + Left = 1064 + Top = 0 + Caption = #25209#37327#20462#25913#33853#33394 + ImageIndex = 54 + OnClick = ToolButton14Click + end object ToolButton1: TToolButton - Left = 456 - Top = 30 + Left = 1183 + Top = 0 AutoSize = True Caption = #25171#21360#26631#31614 ImageIndex = 96 + Wrap = True OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 543 + Left = 0 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -154,7 +161,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 630 + Left = 87 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -163,25 +170,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 729 + Left = 186 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 - Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 0 - Top = 60 + Left = 297 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 63 - Top = 60 + Left = 360 + Top = 30 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -195,8 +201,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 131 - Top = 63 + Left = 428 + Top = 33 Width = 218 Height = 24 Style = csDropDownList @@ -220,8 +226,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 349 - Top = 60 + Left = 646 + Top = 30 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -234,32 +240,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 470 - Top = 60 + Left = 767 + Top = 30 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end + object ToolButton15: TToolButton + Left = 886 + Top = 30 + AutoSize = True + Caption = #25209#37327#20462#25913#31995#25968 + ImageIndex = 54 + OnClick = ToolButton15Click + end object ToolButton9: TToolButton - Left = 589 - Top = 60 + Left = 997 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 676 - Top = 60 + Left = 1084 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 739 - Top = 60 + Left = 1147 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -268,8 +282,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 92 - Width = 1384 + Top = 62 + Width = 1392 Height = 88 Align = alTop BevelInner = bvRaised @@ -783,9 +797,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 180 - Width = 1384 - Height = 538 + Top = 150 + Width = 1392 + Height = 576 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -796,7 +810,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnCellDblClick = Tv1CellDblClick DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < item @@ -1092,6 +1105,18 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1ftyStr4: TcxGridDBColumn + Caption = #26579#21378#32568#21495 + DataBinding.FieldName = 'ftyStr4' + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1fadColor: TcxGridDBColumn + Caption = #33853#33394 + DataBinding.FieldName = 'fadColor' + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 7eae079..09ee48a 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -12,19 +12,19 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinBlack, dxSkinBlue, - dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, - dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, - dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, - dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, - dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, - dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, - dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, - dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, - dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, - dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, - dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, - dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, + dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, + dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmJYOrderCDOne = class(TForm) @@ -223,6 +223,10 @@ type ComboBox3: TComboBox; Edit6: TEdit; Tv1Column2: TcxGridDBColumn; + Tv1ftyStr4: TcxGridDBColumn; + Tv1fadColor: TcxGridDBColumn; + ToolButton14: TToolButton; + ToolButton15: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -284,6 +288,8 @@ type procedure Button8Click(Sender: TObject); procedure Button14Click(Sender: TObject); procedure Button13Click(Sender: TObject); + procedure ToolButton14Click(Sender: TObject); + procedure ToolButton15Click(Sender: TObject); // procedure Edit5Click(Sender: TObject); // procedure CheckBox3Click(Sender: TObject); private @@ -419,6 +425,7 @@ procedure TfrmJYOrderCDOne.InitSum(); var sumP, sumLen, sumMZ, sumJZ: double; begin + if Order_Main.IsEmpty then exit; try @@ -896,12 +903,14 @@ end; procedure TfrmJYOrderCDOne.Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin + if Order_Main.IsEmpty = False then begin InitOrderColor(Trim(Order_Main.fieldbyname('MainId').AsString), PRTColor, ADOQueryTemp); //InitBCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),AOrdDefStr1,ADOQueryTemp); //InitRCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),GangNo,ADOQueryTemp); end; + end; procedure TfrmJYOrderCDOne.GetCDSData(); @@ -1512,12 +1521,12 @@ begin with ADOQueryTemp do begin Close; - sql.Clear; + sql.Clear; sql.Add(sqlStr); // showmessage(sql.text); ExecSQL; end; - if (trim(ComboBox1.Text) = '뵥(ë)') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ë)') then + if (trim(ComboBox1.Text) = '뵥(ë)') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(ë)') then begin with ADOQueryTemp do begin @@ -1542,7 +1551,7 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥(Ӣĸ׺)') or (trim(ComboBox1.Text) = '뵥(ëӢĸ׺)') or (trim(ComboBox1.Text) = '뵥(ëӢĸ׺)') then + if (trim(ComboBox1.Text) = '뵥(Ӣĸ׺)') or (trim(ComboBox1.Text) = '뵥(ëӢĸ׺)') or (trim(ComboBox1.Text) = '뵥(ëӢĸ׺)') then begin with ADOQueryTemp do begin @@ -1565,9 +1574,9 @@ begin sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; - end; + end; end; - if (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin @@ -1591,9 +1600,9 @@ begin sql.add(',@flag=''2'' '); Open; end; - end; - if (trim(ComboBox1.Text) = '뵥') then - begin + end; + if (trim(ComboBox1.Text) = '뵥') then + begin with ADOQueryTemp do begin Close; @@ -1617,6 +1626,32 @@ begin end; end; + if (trim(ComboBox1.Text) = '뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMD_LMB '); +// sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(' @DName=' + quotedstr(Trim(DCode))); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + + with ADOQueryPrint do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + end; + if (trim(ComboBox1.Text) = '뵥(Ⱦɫ)') or (trim(ComboBox1.Text) = '뵥(и׺ž)') or (trim(ComboBox1.Text) = '뵥(и׺ë)') or (trim(ComboBox1.Text) = '뵥(޸׺ž)') or (trim(ComboBox1.Text) = '뵥(޸׺ë)') then begin with ADOQueryTemp do @@ -1665,7 +1700,7 @@ begin sql.add(',@flag=''2'' '); Open; end; - end; + end; if FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile); @@ -1827,12 +1862,12 @@ begin end; try Order_Main.DisableControls; - ADOQueryCmd.Connection.BeginTrans; + ADOQueryCmd.Connection.BeginTrans; with Order_Main do begin First; while not Eof do - begin + begin if Order_Main.FieldByName('SSel').AsBoolean = True then begin with ADOQueryCmd do @@ -1895,7 +1930,10 @@ begin end; procedure TfrmJYOrderCDOne.v1Column22PropertiesChange(Sender: TObject); +var + topIndex : Integer; begin + topIndex := tv1.Controller.TopRowIndex; FID := trim(Order_Main.Fieldbyname('MJID').AsString); Order_Main.Edit; if Order_Main.FieldByName('ssel').AsBoolean = false then @@ -1906,6 +1944,7 @@ begin Order_Main.FieldByName('ssel').AsBoolean := False; InitSum(); + tv1.Controller.TopRowIndex := topIndex; end; procedure TfrmJYOrderCDOne.Image1Click(Sender: TObject); @@ -2270,5 +2309,91 @@ begin end; +procedure TfrmJYOrderCDOne.ToolButton14Click(Sender: TObject); +var + InputValue: string; + topIndex: Integer; +begin + topIndex := tv1.Controller.TopRowIndex; + if InputQuery('ɫ޸', '룺', InputValue) then + begin +// if InputValue <> '' then +// begin + Order_Main.DisableControls; + Order_Main.First; + while not Order_Main.Eof do + begin + if Order_Main.FieldByName('ssel').AsBoolean then + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.add(' update WFB_MJJY set fadColor = ' + QuotedStr(Trim(InputValue))); + SQL.Add(' where MJID = ' + QuotedStr(Trim(Order_Main.fieldByName('MJID').AsString))); + ExecSQL; + end; + end; + Order_Main.Next; + end; + Order_Main.EnableControls; +// end; + end; + tv1.Controller.TopRowIndex := topIndex; + +end; + +procedure TfrmJYOrderCDOne.ToolButton15Click(Sender: TObject); +var + InputValue: string; + topIndex: Integer; + numValue: Double; +begin + topIndex := tv1.Controller.TopRowIndex; + if InputQuery('ϵ޸', '룺', InputValue) then + begin + if TryStrToFloat(Trim(InputValue), numValue) then + begin + // λС + InputValue := FormatFloat('0.00', numValue); + + Order_Main.DisableControls; + try + Order_Main.First; + while not Order_Main.Eof do + begin + if Order_Main.FieldByName('ssel').AsBoolean then + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add(' update WFB_MJJY set LenXS = ' + InputValue ); + SQL.Add(' where MJID = ' + QuotedStr(Trim(Order_Main.FieldByName('MJID').AsString))); + + SQL.Add(' update WFB_MJJY set oldLen = MJLen ' ); + SQL.Add(' where MJID = ' + QuotedStr(Trim(Order_Main.FieldByName('MJID').AsString))); + + SQL.Add('update WFB_MJJY set MJLen = MJQty4* ' + InputValue ); + SQL.Add(' where MJID = ' + QuotedStr(Trim(Order_Main.FieldByName('MJID').AsString))); +// ShowMessage(SQL.Text); + ExecSQL; + end; + end; + Order_Main.Next; + end; + finally + Order_Main.EnableControls; + end; + end + else + begin + // 벻Чʱʾ + ShowMessage('Ч֣'); + end; + end; + tv1.Controller.TopRowIndex := topIndex; +end; + end. diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 3f4ddc9..28dd5da 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -1,8 +1,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 413 - Top = 170 + Left = 817 + Top = 467 Width = 1366 - Height = 754 + Height = 814 Caption = #25104#21697#26816#39564 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 87 Width = 214 - Height = 628 + Height = 696 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -118,6 +118,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Styles.Header = cxStyle5 Width = 100 end + object Tv3ftyStr4: TcxGridDBColumn + Caption = #26579#21378#32568#21495 + DataBinding.FieldName = 'ftyStr4' + HeaderAlignmentHorz = taCenter + end end object cxGridLevel2: TcxGridLevel GridView = Tv3 @@ -126,8 +131,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 633 Top = 87 - Width = 717 - Height = 628 + Width = 725 + Height = 696 Align = alClient Color = clWhite ParentColor = False @@ -978,7 +983,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 428 Top = 87 Width = 205 - Height = 628 + Height = 696 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -986,7 +991,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF TabOrder = 2 object Label9: TLabel Left = 152 - Top = 78 + Top = 109 Width = 15 Height = 22 Caption = 'M' @@ -1000,7 +1005,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label3: TLabel Left = 144 - Top = 419 + Top = 445 Width = 26 Height = 22 Caption = 'cm' @@ -1013,7 +1018,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label4: TLabel Left = 152 - Top = 185 + Top = 212 Width = 28 Height = 22 Caption = 'KG' @@ -1026,7 +1031,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label5: TLabel Left = 8 - Top = 77 + Top = 106 Width = 42 Height = 20 Caption = #38271#24230 @@ -1039,7 +1044,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label6: TLabel Left = 8 - Top = 419 + Top = 445 Width = 42 Height = 20 Caption = #24133#23485 @@ -1052,7 +1057,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label11: TLabel Left = 8 - Top = 185 + Top = 212 Width = 42 Height = 20 Caption = #27611#37325 @@ -1065,7 +1070,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label10: TLabel Left = 8 - Top = 332 + Top = 358 Width = 42 Height = 20 Caption = #27491#21697 @@ -1078,7 +1083,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label12: TLabel Left = 92 - Top = 332 + Top = 358 Width = 40 Height = 19 Caption = #27425#21697 @@ -1118,7 +1123,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label15: TLabel Left = 4 - Top = 206 + Top = 242 Width = 5 Height = 22 Font.Charset = ANSI_CHARSET @@ -1131,7 +1136,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label22: TLabel Left = 144 - Top = 449 + Top = 475 Width = 36 Height = 22 Caption = 'g/'#13217 @@ -1144,7 +1149,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label23: TLabel Left = 8 - Top = 448 + Top = 474 Width = 42 Height = 20 Caption = #20811#37325 @@ -1157,7 +1162,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label27: TLabel Left = 4 - Top = 248 + Top = 275 Width = 20 Height = 40 Caption = #36192#13#10#36865 @@ -1170,7 +1175,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label26: TLabel Left = 8 - Top = 375 + Top = 401 Width = 42 Height = 20 Caption = #20986#32440 @@ -1197,7 +1202,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label30: TLabel Left = 8 - Top = 113 + Top = 141 Width = 42 Height = 20 Caption = #30382#37325 @@ -1210,7 +1215,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label31: TLabel Left = 152 - Top = 149 + Top = 176 Width = 28 Height = 22 Caption = 'KG' @@ -1223,7 +1228,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label32: TLabel Left = 8 - Top = 149 + Top = 176 Width = 42 Height = 20 Caption = #20928#37325 @@ -1236,7 +1241,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label33: TLabel Left = 152 - Top = 114 + Top = 145 Width = 28 Height = 22 Caption = 'KG' @@ -1249,7 +1254,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label34: TLabel Left = 90 - Top = 378 + Top = 404 Width = 40 Height = 19 Caption = #20221#25968 @@ -1288,7 +1293,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label39: TLabel Left = 8 - Top = 221 + Top = 248 Width = 42 Height = 20 Caption = #31995#25968 @@ -1327,7 +1332,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label28: TLabel Left = 10 - Top = 296 + Top = 323 Width = 42 Height = 20 Caption = #21253#21495 @@ -1339,8 +1344,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False end object Label53: TLabel - Left = 8 - Top = 479 + Left = 88 + Top = 663 Width = 42 Height = 20 Caption = #21305#25968 @@ -1350,10 +1355,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False + Visible = False end object Label54: TLabel Left = 101 - Top = 250 + Top = 277 Width = 20 Height = 40 Caption = #35753#13#10#37325 @@ -1364,9 +1370,36 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Style = [] ParentFont = False end + object Label55: TLabel + Left = 8 + Top = 73 + Width = 84 + Height = 20 + Caption = #26579#21378#32568#21495 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label56: TLabel + Left = 136 + Top = 507 + Width = 42 + Height = 20 + Caption = #33853#33394 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + Visible = False + end object MJFK: TEdit Left = 51 - Top = 413 + Top = 439 Width = 90 Height = 30 AutoSize = False @@ -1382,7 +1415,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJLen: TEdit Left = 57 - Top = 73 + Top = 102 Width = 90 Height = 35 AutoSize = False @@ -1400,7 +1433,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJMaoZ: TEdit Left = 57 - Top = 181 + Top = 208 Width = 90 Height = 35 AutoSize = False @@ -1417,7 +1450,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object BTPrint: TButton Left = 10 - Top = 510 + Top = 499 Width = 171 Height = 69 Caption = #25552#20132 @@ -1432,7 +1465,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit3: TEdit Left = 52 - Top = 326 + Top = 352 Width = 39 Height = 43 Font.Charset = GB2312_CHARSET @@ -1449,7 +1482,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit4: TEdit Left = 130 - Top = 326 + Top = 352 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1482,7 +1515,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJSJKZ: TEdit Left = 51 - Top = 443 + Top = 469 Width = 90 Height = 30 AutoSize = False @@ -1498,7 +1531,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJQty2: TEdit Left = 25 - Top = 253 + Top = 280 Width = 76 Height = 35 AutoSize = False @@ -1516,7 +1549,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit6: TEdit Left = 52 - Top = 369 + Top = 395 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1550,7 +1583,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJQty3: TEdit Left = 57 - Top = 109 + Top = 137 Width = 90 Height = 35 AutoSize = False @@ -1568,7 +1601,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJQty4: TEdit Left = 57 - Top = 145 + Top = 172 Width = 90 Height = 35 AutoSize = False @@ -1586,7 +1619,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object ComboBox1: TComboBox Left = 132 - Top = 370 + Top = 396 Width = 45 Height = 40 Style = csDropDownList @@ -1609,7 +1642,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJStr4: TEdit Left = 57 - Top = 37 + Top = 33 Width = 90 Height = 35 AutoSize = False @@ -1629,7 +1662,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 57 Top = 1 Width = 90 - Height = 35 + Height = 32 AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1643,7 +1676,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object kmxs: TEdit Left = 57 - Top = 217 + Top = 244 Width = 90 Height = 35 AutoSize = False @@ -1676,7 +1709,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object baoNo: TEdit Left = 57 - Top = 289 + Top = 316 Width = 90 Height = 35 AutoSize = False @@ -1699,7 +1732,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Button7: TButton Left = 10 - Top = 582 + Top = 570 Width = 171 Height = 53 Caption = #25171#21253#26631#31614 @@ -1713,8 +1746,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = Button7Click end object Edit13: TEdit - Left = 51 - Top = 474 + Left = 131 + Top = 658 Width = 90 Height = 35 AutoSize = False @@ -1725,12 +1758,13 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Style = [fsBold] ParentFont = False TabOrder = 21 + Visible = False OnClick = MJXHClick OnKeyPress = MJstr3KeyPress end object MJqty5: TEdit Left = 124 - Top = 253 + Top = 280 Width = 74 Height = 36 AutoSize = False @@ -1746,6 +1780,44 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnKeyDown = MJQty4KeyDown OnKeyPress = MJstr3KeyPress end + object FtyStr4: TEdit + Left = 94 + Top = 67 + Width = 90 + Height = 35 + AutoSize = False + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -28 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 + ParentFont = False + TabOrder = 23 + OnClick = MJXHClick + OnExit = MJStr4Exit + OnKeyPress = MJstr3KeyPress + end + object fadColor: TEdit + Left = 185 + Top = 499 + Width = 90 + Height = 35 + AutoSize = False + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -28 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861 + ParentFont = False + TabOrder = 24 + Text = 'A' + Visible = False + OnClick = MJXHClick + OnExit = MJStr4Exit + OnKeyPress = MJstr3KeyPress + end end object MovePanel1: TMovePanel Left = 635 @@ -2001,7 +2073,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 214 Top = 87 Width = 214 - Height = 628 + Height = 696 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2010,7 +2082,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 210 - Height = 303 + Height = 371 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2118,7 +2190,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 305 + Top = 373 Width = 210 Height = 28 Align = alBottom @@ -2133,7 +2205,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 333 + Top = 401 Width = 210 Height = 293 Align = alBottom @@ -2346,7 +2418,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1350 + Width = 1358 Height = 30 AutoSize = True ButtonHeight = 30 @@ -2534,7 +2606,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel6: TPanel Left = 0 Top = 30 - Width = 1350 + Width = 1358 Height = 57 Align = alTop BevelInner = bvRaised diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index f4e5be6..a8cab70 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -266,6 +266,11 @@ type Edit13: TEdit; Label54: TLabel; MJqty5: TEdit; + Label55: TLabel; + FtyStr4: TEdit; + Tv3ftyStr4: TcxGridDBColumn; + Label56: TLabel; + fadColor: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -1033,6 +1038,8 @@ begin FieldByName('MJBanZu').Value := Trim(FBanZu); FieldByName('MJstr3').Value := Trim(MJstr3.Text); FieldByName('MJstr4').Value := Trim(MJstr4.Text); + FieldByName('Ftystr4').Value := Trim(Ftystr4.Text); + FieldByName('fadColor').Value := Trim(fadColor.Text); FieldByName('MJstr5').Value := Trim(MJstr5.Text); FieldByName('mjxh').Value := Trim(mjxh.Text); // FieldByName('BaoNO').Value := Trim(BaoNO.Text); @@ -2617,6 +2624,7 @@ begin Edit3.Text := ''; Edit4.Text := ''; MJStr4.Text := Trim(ADOTmp.fieldbyname('PRTGH').AsString); + fadColor.Text := 'A'; end else begin @@ -2629,6 +2637,8 @@ begin FSubId := ''; AOrdDefNote1.Text := ''; MJStr4.Text := ''; + ftyStr4.Text := ''; + fadColor.Text := 'A'; fRollType := ''; Exit; end; @@ -2847,6 +2857,9 @@ begin Label15.Caption := Trim(CDS_MJID.fieldbyname('MJID').AsString); MJLen.Text := Trim(ADOTmp.fieldbyname('MJLen').AsString); MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString); + ftyStr4.Text := Trim(ADOTmp.fieldbyname('ftyStr4').AsString); + fadColor.Text := Trim(ADOTmp.fieldbyname('fadColor').AsString); + MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString); baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString); baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString); diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm index cc20e5f..00ae56c 100644 --- a/打卷检验管理/U_ProductOrderNewList.dfm +++ b/打卷检验管理/U_ProductOrderNewList.dfm @@ -20,7 +20,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -187,7 +187,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object Panel1: TPanel Left = 0 Top = 32 - Width = 1366 + Width = 1374 Height = 40 Align = alTop BevelInner = bvRaised @@ -416,7 +416,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid1: TcxGrid Left = 0 Top = 95 - Width = 1366 + Width = 1374 Height = 333 Align = alTop TabOrder = 3 @@ -764,8 +764,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 451 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -773,8 +773,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 459 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -782,7 +782,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 @@ -1097,7 +1097,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1127,7 +1127,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxTabControl1: TcxTabControl Left = 0 Top = 72 - Width = 1366 + Width = 1374 Height = 23 Align = alTop TabOrder = 2 @@ -1140,7 +1140,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas index 39022d2..db91e14 100644 --- a/打卷检验管理/U_ProductOrderNewList.pas +++ b/打卷检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm)