diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index bd4d1b2..40c79a2 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,10 +101,14 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJyalu\\testDll.exe Launcher= UseLauncher=0 DebugCWD= +[Language] +ActiveLang= +ProjectLang= +RootDir= [Version Info] IncludeVerInfo=0 AutoIncBuild=0 diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 9fb58dd..ec2e761 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,8 +1,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 230 + Left = 385 Top = 202 - Width = 1382 - Height = 533 + Width = 1227 + Height = 689 Caption = #26816#39564#25253#21578 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1211 Height = 62 AutoSize = True ButtonHeight = 30 @@ -234,9 +234,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333'('#38271#24230')' #26816#39564#30721#21333'('#20928#37325')' #26816#39564#30721#21333'('#20840')' - '' - '' - '') + #26816#39564#30721#21333'('#27454#21495')') end object ToolButton9: TToolButton Left = 945 @@ -266,7 +264,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1366 + Width = 1211 Height = 88 Align = alTop BevelInner = bvRaised @@ -795,8 +793,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1366 - Height = 344 + Width = 1211 + Height = 500 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1940,15 +1938,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object RMDB_Main: TRMDBDataSet Visible = True DataSet = ADOQueryPrint - Left = 696 - Top = 280 + Left = 712 + Top = 440 end object ADOQueryPrint: TADOQuery Connection = DataLink_TradeManage.ADOLink LockType = ltReadOnly Parameters = <> - Left = 648 - Top = 232 + Left = 568 + Top = 456 end object CDS_CD: TClientDataSet Aggregates = <> @@ -2060,4 +2058,17 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 376 Top = 264 end + object RMDBD_Z: TRMDBDataSet + Visible = True + DataSet = ADOQuery1 + Left = 656 + Top = 448 + end + object ADOQuery1: TADOQuery + Connection = DataLink_TradeManage.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 616 + Top = 456 + end end diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 8c954a9..268b2d3 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) @@ -219,6 +219,8 @@ type ToolButton4: TToolButton; Label36: TLabel; ComboBox2: TComboBox; + RMDBD_Z: TRMDBDataSet; + ADOQuery1: TADOQuery; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -753,9 +755,9 @@ var fPrintFile: string; Txt, fImagePath: string; Moudle: THandle; - Makebar: TMakebar; + Makebar: TMakebar; Mixtext: TMixtext; -begin +begin if Order_Main.IsEmpty then Exit; if Order_Main.Locate('SSel', True, []) = False then @@ -763,7 +765,7 @@ begin Application.MessageBox('ûѡ!', 'ʾ', 0); Exit; end; - with ADOQueryCmd do + with ADOQueryCmd do begin Close; sql.Clear; @@ -782,7 +784,7 @@ begin try ADOQueryCmd.Connection.BeginTrans; with Order_Main do - begin + begin First; while not Eof do begin @@ -803,8 +805,8 @@ begin ADOQueryCmd.Connection.RollbackTrans; end; Order_Main.EnableControls; - - with ADOQueryTemp do + + with ADOQueryTemp do begin Close; sql.Clear; @@ -812,75 +814,75 @@ begin // showmessage(sql.text); Open; end; - Order_Main.DisableControls; - with ADOQueryTemp do + Order_Main.DisableControls; + with ADOQueryTemp do begin First; while not Eof do begin // if Order_Main.FieldByName('SSel').AsBoolean = True then // begin - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('Update WFB_MJJY Set PrtAgnFlag=1,PrtAgnDate=getdate(),PrtAgnPerson=''' + Trim(DName) + ''''); - sql.Add(' where MJID=''' + Trim(ADOQueryTemp.fieldbyname('MJID').AsString) + ''''); - ExecSQL; - end; - try - Moudle := LoadLibrary('MakeQRBarcode.dll'); - @Makebar := GetProcAddress(Moudle, 'Make'); - @Mixtext := GetProcAddress(Moudle, 'MixText'); - Txt := Trim(ADOQueryTemp.fieldbyname('MJID').AsString); - fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp'; - if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then - CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil); - if FileExists(fImagePath) then - DeleteFile(fImagePath); - Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3); - except - application.MessageBox('ʧܣ', 'ʾϢ', MB_ICONERROR); - Order_Main.EnableControls; - exit; - end; - with ADOQueryPrint do - begin - Close; - SQL.Clear; - sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.conNo,B.customerNoName,B.LBName '); - sql.Add(',EngColor=(select max(Note) from KH_Zdy X where X.ZDYName=C.PRTColor and X.Type=''OrdColor'' ) '); - sql.Add(',B.MPRTCF,C.*,A.* '); - sql.Add(' from WFB_MJJY A'); - sql.Add(' inner join JYOrder_Main B On A.Mainid=B.Mainid'); - sql.Add(' inner join JYOrder_Sub C on A.SubId=C.SubId'); - SQL.Add(' where A.MJID=''' + Trim(ADOQueryTemp.fieldbyname('MJID').AsString) + ''''); - Open; - end; - if Trim(ADOQueryPrint.fieldbyname('SLbName').AsString) <> '' then - begin - ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('SLbName').AsString), ADOQueryCmd); - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('SLbName').AsString); - end - else - begin - ExportFtErpFile('ͨñǩ.rmf', ADOQueryCmd); - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨñǩ.rmf'; - end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update WFB_MJJY Set PrtAgnFlag=1,PrtAgnDate=getdate(),PrtAgnPerson=''' + Trim(DName) + ''''); + sql.Add(' where MJID=''' + Trim(ADOQueryTemp.fieldbyname('MJID').AsString) + ''''); + ExecSQL; + end; + try + Moudle := LoadLibrary('MakeQRBarcode.dll'); + @Makebar := GetProcAddress(Moudle, 'Make'); + @Mixtext := GetProcAddress(Moudle, 'MixText'); + Txt := Trim(ADOQueryTemp.fieldbyname('MJID').AsString); + fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp'; + if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then + CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil); + if FileExists(fImagePath) then + DeleteFile(fImagePath); + Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3); + except + application.MessageBox('ʧܣ', 'ʾϢ', MB_ICONERROR); + Order_Main.EnableControls; + exit; + end; + with ADOQueryPrint do + begin + Close; + SQL.Clear; + sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.conNo,B.customerNoName,B.LBName '); + sql.Add(',EngColor=(select max(Note) from KH_Zdy X where X.ZDYName=C.PRTColor and X.Type=''OrdColor'' ) '); + sql.Add(',B.MPRTCF,C.*,A.* '); + sql.Add(' from WFB_MJJY A'); + sql.Add(' inner join JYOrder_Main B On A.Mainid=B.Mainid'); + sql.Add(' inner join JYOrder_Sub C on A.SubId=C.SubId'); + SQL.Add(' where A.MJID=''' + Trim(ADOQueryTemp.fieldbyname('MJID').AsString) + ''''); + Open; + end; + if Trim(ADOQueryPrint.fieldbyname('SLbName').AsString) <> '' then + begin + ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('SLbName').AsString), ADOQueryCmd); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('SLbName').AsString); + end + else + begin + ExportFtErpFile('ͨñǩ.rmf', ADOQueryCmd); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨñǩ.rmf'; + end; - if FileExists(fPrintFile) then - begin - RMVariables['QRBARCODE'] := fImagePath; - RM2.LoadFromFile(fPrintFile); - Rm2.DefaultCopies := strtointdef(trim(ComboBox2.Text), 1); - RM2.PrintReport; - end - else - begin - Order_Main.EnableControls; - Application.MessageBox(PChar('ûҵ' + ExtractFilePath(Application.ExeName) + 'Report\ǩ.rmf'), 'ʾ', 0); - Exit; - end; + if FileExists(fPrintFile) then + begin + RMVariables['QRBARCODE'] := fImagePath; + RM2.LoadFromFile(fPrintFile); + Rm2.DefaultCopies := strtointdef(trim(ComboBox2.Text), 1); + RM2.PrintReport; + end + else + begin + Order_Main.EnableControls; + Application.MessageBox(PChar('ûҵ' + ExtractFilePath(Application.ExeName) + 'Report\ǩ.rmf'), 'ʾ', 0); + Exit; + end; // end; Next; end; @@ -1658,32 +1660,41 @@ begin Open; end; end; -{ - if (trim(ComboBox1.Text) = '뵥(Ⱦɫ)') OR (trim(ComboBox1.Text) = '뵥(ӡ)') then + + if (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin Close; sql.Clear; - sql.add('exec P_Print_CKMD '); - sql.add('@mainID=' + quotedstr(Trim(''))); - sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add('exec P_Print_CKMDHAEIL '); + 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; + with ADOQuery1 do //RMDBD_Z 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'' '); + sql.add(',@flag=''23'' '); Open; end; - end; } + end; if (trim(ComboBox1.Text) = '뵥(Ⱦɫ)') or (trim(ComboBox1.Text) = '뵥(ӡ)') then begin with ADOQueryTemp do