diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index c019020..899b2a1 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\Ҷݸ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJyezhoufh\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/U_CKProductJYHZList.dfm b/打卷检验管理/U_CKProductJYHZList.dfm index cd03ff0..e8c8f1c 100644 --- a/打卷检验管理/U_CKProductJYHZList.dfm +++ b/打卷检验管理/U_CKProductJYHZList.dfm @@ -186,7 +186,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Top = 16 Width = 36 Height = 12 - Caption = #21512#21516#21495 + Caption = #23458' '#25143 end object Label15: TLabel Left = 616 @@ -194,6 +194,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Width = 18 Height = 12 Caption = 'PO#' + Visible = False end object MPRTCodeName: TEdit Tag = 2 @@ -301,7 +302,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList TabOrder = 10 OnChange = MPRTCodeNameChange end - object conNo: TEdit + object CustomerNoName: TEdit Tag = 2 Left = 638 Top = 12 @@ -317,6 +318,7 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Width = 80 Height = 20 TabOrder = 12 + Visible = False OnChange = MPRTCodeNameChange end end @@ -377,14 +379,8 @@ object frmCKProductJYHZList: TfrmCKProductJYHZList Width = 72 end object v1Column9: TcxGridDBColumn - Caption = #21512#21516#21495 - DataBinding.FieldName = 'conNo' - HeaderAlignmentHorz = taCenter - Width = 80 - end - object v1Column10: TcxGridDBColumn - Caption = 'PO#' - DataBinding.FieldName = 'khconNO' + Caption = #23458#25143 + DataBinding.FieldName = 'CustomerNoName' HeaderAlignmentHorz = taCenter Width = 80 end diff --git a/打卷检验管理/U_CKProductJYHZList.pas b/打卷检验管理/U_CKProductJYHZList.pas index 1a48f91..6b1d46a 100644 --- a/打卷检验管理/U_CKProductJYHZList.pas +++ b/打卷检验管理/U_CKProductJYHZList.pas @@ -4,14 +4,26 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, - cxDataStorage, cxEdit, DB, cxDBData, cxGridCustomTableView, - cxGridTableView, cxGridBandedTableView, cxGridDBBandedTableView, - cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridDBTableView, - cxGrid, StdCtrls, ComCtrls, ExtCtrls, ToolWin, cxGridCustomPopupMenu, - cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, MovePanel, cxButtonEdit, - cxCalendar, RM_System, RM_Common, RM_Class, RM_GridReport, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses, + cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, + ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, + cxDropDownEdit, MovePanel, cxButtonEdit, cxCalendar, RM_System, RM_Common, + RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, + 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 TfrmCKProductJYHZList = class(TForm) @@ -73,8 +85,7 @@ type RichEdit1: TRichEdit; v1Column2: TcxGridDBColumn; v1Column9: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; - conNo: TEdit; + CustomerNoName: TEdit; Label14: TLabel; KHCONNO: TEdit; Label15: TLabel; @@ -95,19 +106,15 @@ type procedure TBExportClick(Sender: TObject); procedure TBFindClick(Sender: TObject); procedure MPRTCodeNameChange(Sender: TObject); - procedure v1Column5PropertiesButtonClick(Sender: TObject; - AButtonIndex: Integer); + procedure v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure PRTColorChange(Sender: TObject); procedure Image2Click(Sender: TObject); - procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); - procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure TBPrintClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); private - FLeft,FTop:Integer; + FLeft, FTop: Integer; procedure InitGrid(); { Private declarations } public @@ -118,57 +125,57 @@ var frmCKProductJYHZList: TfrmCKProductJYHZList; implementation + uses - U_DataLink,U_Fun,U_ZDYHelp,U_JYOrderCDOne; + U_DataLink, U_Fun, U_ZDYHelp, U_JYOrderCDOne; {$R *.dfm} procedure TfrmCKProductJYHZList.FormDestroy(Sender: TObject); begin - frmCKProductJYHZList:=nil; + frmCKProductJYHZList := nil; end; -procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; - var Action: TCloseAction); +procedure TfrmCKProductJYHZList.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmCKProductJYHZList.FormCreate(Sender: TObject); begin //cxGrid1.Align:=alClient; - BegDate.DateTime:=SGetServerDateTime(ADOQueryTemp); - EndDate.DateTime:=SGetServerDateTime(ADOQueryTemp) + BegDate.DateTime := SGetServerDateTime(ADOQueryTemp); + EndDate.DateTime := SGetServerDateTime(ADOQueryTemp) end; procedure TfrmCKProductJYHZList.InitGrid(); begin try ADOQueryMain.DisableControls; - with ADOQueryMain do + with ADOQueryMain do begin Close; sql.Clear; - Filtered:=False; - sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4, '); + Filtered := False; + sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,A.Mjstr4,C.OrderNo,C.ConNO,C.CustomerNoName,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4, '); sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as MJQty4,'); - sql.Add('JQty=(select count(*) from WFB_MJJY X where X.SubId=A.SubId),'); - sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('SkcROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); - sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''ѳ''),'); - sql.Add('KCROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''δ''),'); - sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)'); + sql.Add('SUM(CASE WHEN ckflag = ''ѳ'' THEN MJLen ELSE 0 END) AS SCKROLL,'); + sql.Add(' SUM(CASE WHEN ckflag = ''δ'' THEN MJLen ELSE 0 END) AS SkcROLL,'); + sql.Add(' SUM(CASE WHEN ckflag = ''ѳ'' THEN 1 ELSE 0 END) AS CKROLL,'); + sql.Add(' SUM(CASE WHEN ckflag = ''δ'' THEN 1 ELSE 0 END) AS KCROLL'); + // sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)'); sql.Add('from WFB_MJJY A '); sql.Add('inner join JYOrder_Main C on C.MainId=A.MainId '); sql.Add('inner join JYOrder_sub D on D.subID=A.subID '); - Sql.add('where A.fillTime>='''+formatdateTime('yyyy-MM-dd',begdate.Date)+''' '); - Sql.add('and A.fillTime<'''+formatdateTime('yyyy-MM-dd',enddate.Date+1)+''' '); - Sql.add('group by convert(char(10),A.fillTime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4'); + Sql.add('where A.fillTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); + Sql.add('and A.fillTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); + Sql.add('group by convert(char(10),A.fillTime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,A.Mjstr4,C.OrderNo,C.ConNO,C.CustomerNoName,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4'); +// ShowMessage(SQL.Text); Open; - //ShowMessage(SQL.Text); + end; - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); finally ADOQueryMain.EnableControls; end; @@ -177,34 +184,35 @@ end; procedure TfrmCKProductJYHZList.TBRafreshClick(Sender: TObject); begin //BegDate.SetFocus; - MovePanel2.Visible:=True; + MovePanel2.Visible := True; MovePanel2.Refresh; InitGrid(); - MovePanel2.Visible:=False; + MovePanel2.Visible := False; end; procedure TfrmCKProductJYHZList.ConNoMChange(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); end; end; procedure TfrmCKProductJYHZList.TBCloseClick(Sender: TObject); begin - WriteCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); + WriteCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); Close; end; procedure TfrmCKProductJYHZList.FormShow(Sender: TObject); begin - ReadCxGrid(self.Caption+tv1.Name,Tv1,'Ʒֿ'); - if Trim(DParameters2)='' then + ReadCxGrid(self.Caption + tv1.Name, Tv1, 'Ʒֿ'); + if Trim(DParameters2) = '' then begin //v1Column5.Options.Focusing:=True; - end else + end + else begin //v1Column5.Options.Focusing:=False; end; @@ -213,17 +221,18 @@ end; procedure TfrmCKProductJYHZList.TBExportClick(Sender: TObject); begin - if ADOQueryMain.IsEmpty then exit; - TcxGridToExcel('б',cxGrid2); + if ADOQueryMain.IsEmpty then + exit; + TcxGridToExcel('б', cxGrid2); end; procedure TfrmCKProductJYHZList.TBFindClick(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,CDS_Main); - SInitCDSData20(ADOQueryMain,CDS_Main); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, CDS_Main); + SInitCDSData20(ADOQueryMain, CDS_Main); end; end; @@ -232,28 +241,27 @@ begin TBFind.Click; end; -procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick( - Sender: TObject; AButtonIndex: Integer); +procedure TfrmCKProductJYHZList.v1Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='SOrdDefStr10'; - flagname:='ŵص'; - if ShowModal=1 then + flag := 'SOrdDefStr10'; + flagname := 'ŵص'; + if ShowModal = 1 then begin with CDS_Main do begin Edit; - FieldByName('SOrdDefStr10').Value:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + FieldByName('SOrdDefStr10').Value := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('Update JYOrder_Sub Set SOrdDefStr10='''+Trim(ClientDataSet1.fieldbyname('ZdyName').AsString)+''''); - sql.Add(' where SubId='''+Trim(Self.CDS_Main.fieldbyname('SubId').AsString)+''''); + sql.Add('Update JYOrder_Sub Set SOrdDefStr10=''' + Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) + ''''); + sql.Add(' where SubId=''' + Trim(Self.CDS_Main.fieldbyname('SubId').AsString) + ''''); ExecSQL; end; end; @@ -270,49 +278,47 @@ end; procedure TfrmCKProductJYHZList.Image2Click(Sender: TObject); begin - Panel4.Visible:=False; + Panel4.Visible := False; end; -procedure TfrmCKProductJYHZList.Tv1CellDblClick( - Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); +procedure TfrmCKProductJYHZList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin - Panel4.Left:=FLeft; - Panel4.Top:=FTop+110; - Panel4.Visible:=True; - Panel10.Caption:=Trim(TV1.Controller.FocusedColumn.Caption); - RichEdit1.Text:=CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; + Panel4.Left := FLeft; + Panel4.Top := FTop + 110; + Panel4.Visible := True; + Panel10.Caption := Trim(TV1.Controller.FocusedColumn.Caption); + RichEdit1.Text := CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString; application.ProcessMessages; end; -procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); +procedure TfrmCKProductJYHZList.Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - FLeft:=X; - FTop:=Y; + FLeft := X; + FTop := Y; end; procedure TfrmCKProductJYHZList.TBPrintClick(Sender: TObject); begin - RMGridReport1.PreviewButtons:=[pbZoom,pbLoad,pbSave,pbPrint,pbFind,pbPageSetup,pbExit,pbExport,pbNavigator]; + RMGridReport1.PreviewButtons := [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbPageSetup, pbExit, pbExport, pbNavigator]; end; procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject); begin - if cds_main.IsEmpty then Exit; - frmJYOrderCDOne:=TfrmJYOrderCDOne.Create(Application); - with frmJYOrderCDOne do + if cds_main.IsEmpty then + Exit; + frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application); + with frmJYOrderCDOne do + begin + orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring); + gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring); + PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring); + if ShowModal = 1 then begin - orderno.Text:=trim(self.CDS_Main.fieldbyname('orderno').asstring); - gangno.Text:=trim(self.CDS_Main.fieldbyname('MJStr4').asstring); - PRTColor.Text:=trim(self.CDS_Main.fieldbyname('PRTColor').asstring); - if ShowModal=1 then - begin // InitGrid(); - end; - free; end; + free; + end; end; end. + 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 91498d7..a6985b8 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1392 + Width = 1384 Height = 62 AutoSize = True ButtonHeight = 30 @@ -268,7 +268,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1392 + Width = 1384 Height = 88 Align = alTop BevelInner = bvRaised @@ -783,8 +783,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1392 - Height = 576 + Width = 1384 + Height = 568 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 4c67bd4..fb5cb54 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, - cxCurrencyEdit, MMSystem; + 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; type TfrmJYOrderCDOne = class(TForm) @@ -1603,7 +1616,7 @@ begin sql.add(',@flag=''2'' '); Open; end; - end; + end; if (trim(ComboBox1.Text) = '뵥(Ⱦɫ)') then begin @@ -1630,7 +1643,31 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = '뵥(׺)') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMD_GH '); + 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=''22'' '); + Open; + end; + end; if (trim(ComboBox1.Text) = 'Ҷ뵥(ɫ)') then begin with ADOQueryTemp do @@ -1663,7 +1700,7 @@ begin begin Close; sql.Clear; - sql.add('exec P_Do_PrintMd10 '); + sql.add('exec P_Do_PrintMd10 '); sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); Open; diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 885124a..22e59f7 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 87 Width = 214 - Height = 744 + Height = 736 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -125,8 +125,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 633 Top = 87 - Width = 725 - Height = 744 + Width = 717 + Height = 736 Align = alClient Color = clWhite ParentColor = False @@ -977,7 +977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 428 Top = 87 Width = 205 - Height = 744 + Height = 736 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2019,7 +2019,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 214 Top = 87 Width = 214 - Height = 744 + Height = 736 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2028,7 +2028,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 210 - Height = 419 + Height = 411 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2136,7 +2136,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 421 + Top = 413 Width = 210 Height = 28 Align = alBottom @@ -2151,7 +2151,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 449 + Top = 441 Width = 210 Height = 293 Align = alBottom @@ -2364,7 +2364,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1358 + Width = 1350 Height = 30 AutoSize = True ButtonHeight = 30 @@ -2552,7 +2552,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel6: TPanel Left = 0 Top = 30 - Width = 1358 + Width = 1350 Height = 57 Align = alTop BevelInner = bvRaised diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index f38cfae..397c931 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -10,7 +10,21 @@ uses cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, - MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI; + MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI, + 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 TfrmMJManageNewFDNewSF = class(TForm) @@ -451,8 +465,8 @@ var fdata: double; begin i1 := Message.WParam; - i2 := Message.LParam; - if IsJsMessage then + i2 := Message.LParam; + if IsJsMessage then begin if (trim(Edit7.Text) = '') then begin @@ -1052,10 +1066,10 @@ begin FieldByName('MJLen').value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; end; - if (trim(MC.Text) <> '') and (trim(MC.Text) <> '0') then + if (trim(MC.Text) <> '') and (trim(MC.Text) <> '0') then begin - FieldByName('MJLen').value := format('%.0f', [(StrToFloatdef(trim(MJLen.Text), 0) / (StrToFloatdef(trim(MC.Text), 100) / 100)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); + FieldByName('MJLen').value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / (StrToFloatdef(trim(MC.Text), 100) / 100)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]); end; // FieldByName('MJLen').value := (StrToFloatdef(trim(MJLen.Text), 0) / (StrToFloatdef(trim(MC.Text), 100) / 100)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; end;