diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index c069893..d2b437f 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\֣ƽ\Ŀ\\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7myFangqiu\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/U_CPDBAO.dfm b/检验管理/U_CPDBAO.dfm index d1bee74..f65a7ff 100644 --- a/检验管理/U_CPDBAO.dfm +++ b/检验管理/U_CPDBAO.dfm @@ -3,7 +3,6 @@ object frmCPDBao: TfrmCPDBao Top = 195 Width = 1382 Height = 754 - VertScrollBar.Position = 2 Caption = #25171#21253#31383#21475 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -21,7 +20,7 @@ object frmCPDBao: TfrmCPDBao TextHeight = 12 object ToolBar1: TToolBar Left = 0 - Top = -2 + Top = 0 Width = 1533 Height = 33 ButtonHeight = 30 @@ -54,7 +53,7 @@ object frmCPDBao: TfrmCPDBao end object Panel1: TPanel Left = 0 - Top = 31 + Top = 33 Width = 1533 Height = 76 Align = alTop @@ -489,7 +488,7 @@ object frmCPDBao: TfrmCPDBao end object Panel2: TPanel Left = 400 - Top = 139 + Top = 141 Width = 1133 Height = 560 Caption = 'Panel2' @@ -832,7 +831,7 @@ object frmCPDBao: TfrmCPDBao end object Panel3: TPanel Left = 999 - Top = 225 + Top = 227 Width = 290 Height = 286 BevelInner = bvRaised @@ -1027,9 +1026,9 @@ object frmCPDBao: TfrmCPDBao end object Panel4: TPanel Left = 0 - Top = 107 + Top = 109 Width = 553 - Height = 592 + Height = 614 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1039,7 +1038,7 @@ object frmCPDBao: TfrmCPDBao Left = 2 Top = 89 Width = 549 - Height = 501 + Height = 523 Align = alClient TabOrder = 0 object Tv3: TcxGridDBTableView @@ -1324,7 +1323,7 @@ object frmCPDBao: TfrmCPDBao end object MovePanel1: TMovePanel Left = 506 - Top = 274 + Top = 276 Width = 715 Height = 327 BevelInner = bvLowered diff --git a/检验管理/U_CPDBAO.pas b/检验管理/U_CPDBAO.pas index ba0c9de..bfcb6ff 100644 --- a/检验管理/U_CPDBAO.pas +++ b/检验管理/U_CPDBAO.pas @@ -11,7 +11,20 @@ uses cxCurrencyEdit, BtnEdit, ExtCtrls, ComCtrls, ToolWin, DBClient, ADODB, MovePanel, Buttons, Menus, cxLookAndFeelPainters, cxButtons, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, cxCheckBox,MMSystem, - cxLookAndFeels, cxNavigator; + cxLookAndFeels, 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 TfrmCPDBao = class(TForm) diff --git a/检验管理/U_DataLink.pas b/检验管理/U_DataLink.pas index 54c5229..8e27ed0 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; + Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, 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; var DConString:String; {ȫַ} server, dtbase, user, pswd: String; {ݿӲ} diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index ae27c94..fa46eab 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 259 - Top = 110 + Left = 763 + Top = 367 Width = 1382 Height = 754 Caption = #26816#39564#25253#21578 @@ -20,7 +20,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 107 @@ -92,51 +93,52 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne AutoSize = True Caption = #25209#37327#35843#25972#37325#37327 ImageIndex = 54 + Wrap = True OnClick = ToolButton5Click end object ToolButton1: TToolButton - Left = 537 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 ImageIndex = 96 OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 624 - Top = 0 + Left = 87 + Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 ImageIndex = 57 OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 711 - Top = 0 + Left = 174 + Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 ImageIndex = 12 OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 810 - Top = 0 + Left = 273 + Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 OnClick = ToolButton2Click end object ToolButton4: TToolButton - Left = 921 - Top = 0 + Left = 384 + Top = 30 AutoSize = True Caption = #25442#31639#31995#25968 ImageIndex = 57 OnClick = ToolButton4Click end object TBAftChkHX: TToolButton - Left = 1008 - Top = 0 + Left = 471 + Top = 30 AutoSize = True Caption = #26816#21518#22238#20462 ImageIndex = 54 @@ -144,8 +146,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TBAftChkHXClick end object TBClose: TToolButton - Left = 1095 - Top = 0 + Left = 558 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -154,8 +156,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1366 + Top = 62 + Width = 1374 Height = 61 Align = alTop BevelInner = bvRaised @@ -569,9 +571,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 125 - Width = 1366 - Height = 590 + Top = 155 + Width = 1374 + Height = 568 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -1109,13 +1111,13 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel7: TPanel Left = 0 - Top = 93 - Width = 1366 + Top = 123 + Width = 1374 Height = 32 Align = alTop TabOrder = 7 DesignSize = ( - 1366 + 1374 32) object LBCPAP: TLabel Left = 643 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 04ee212..1e68bf8 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, cxContainer, cxCurrencyEdit, cxLookAndFeels, cxLookAndFeelPainters, Math, - cxNavigator; + 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 TfrmJYOrderCDOne = class(TForm) @@ -1166,20 +1179,25 @@ begin begin Close; SQL.Clear; - sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,'); + sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,'); + SQL.Add('C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX, '); + sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),'); sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), '); + sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), '); sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); sql.Add('from WFB_MJJY A'); - sql.Add(' inner join JYOrder_Sub C on C.SubID=A.SubID'); - sql.Add(' inner join JYOrder_Main D on D.MainID=A.MainID'); + sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); + sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID'); SQL.Add(' where A.BaoID=''' + Trim(Order_Main.fieldbyname('BaoID').AsString) + ''''); - SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName'); + SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName'); + SQL.Add(',C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX '); + Open; end; if Trim(ADOQueryPrint.fieldbyname('NLBName').AsString) <> '' then diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index a6c49f7..fb510bd 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -1,6 +1,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF - Left = 183 - Top = 22 + Left = 1098 + Top = 387 Width = 1378 Height = 752 Caption = #25104#21697#26816#39564 @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 81 Width = 353 - Height = 632 + Height = 640 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -108,6 +108,13 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Styles.Header = cxStyle5 Width = 40 end + object Tv3baoNo: TcxGridDBColumn + Caption = #21253#21495 + DataBinding.FieldName = 'baoNo' + HeaderAlignmentHorz = taCenter + Styles.Header = cxStyle5 + Width = 80 + end end object cxGridLevel2: TcxGridLevel GridView = Tv3 @@ -116,8 +123,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 833 Top = 81 - Width = 529 - Height = 632 + Width = 537 + Height = 640 Align = alClient TabOrder = 1 object SpeedButton13: TSpeedButton @@ -1106,7 +1113,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 637 Top = 81 Width = 196 - Height = 632 + Height = 640 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1166,7 +1173,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label6: TLabel Left = 251 - Top = 130 + Top = 114 Width = 40 Height = 23 Caption = #24133#23485 @@ -1192,7 +1199,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label10: TLabel Left = 15 - Top = 339 + Top = 369 Width = 40 Height = 23 Caption = #27491#21697 @@ -1205,7 +1212,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label12: TLabel Left = 100 - Top = 339 + Top = 369 Width = 40 Height = 22 Caption = #27425#21697 @@ -1310,7 +1317,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label26: TLabel Left = 15 - Top = 387 + Top = 413 Width = 40 Height = 22 Caption = #20986#32440 @@ -1389,7 +1396,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label34: TLabel Left = 15 - Top = 438 + Top = 460 Width = 40 Height = 22 Caption = #20221#25968 @@ -1466,8 +1473,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False end object Label45: TLabel - Left = 247 - Top = 138 + Left = 17 + Top = 331 Width = 40 Height = 23 Caption = #21253#21495 @@ -1479,8 +1486,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False end object MJFK: TEdit - Left = 296 - Top = 121 + Left = 304 + Top = 105 Width = 90 Height = 41 Color = clSilver @@ -1531,7 +1538,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnKeyPress = MJstr3KeyPress end object BTPrint: TButton - Left = 6 + Left = 14 Top = 496 Width = 83 Height = 53 @@ -1562,7 +1569,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit3: TEdit Left = 60 - Top = 333 + Top = 363 Width = 39 Height = 43 Font.Charset = GB2312_CHARSET @@ -1579,7 +1586,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit4: TEdit Left = 138 - Top = 333 + Top = 363 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1663,7 +1670,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit6: TEdit Left = 60 - Top = 381 + Top = 407 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1731,7 +1738,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object ComboBox1: TComboBox Left = 60 - Top = 430 + Top = 452 Width = 122 Height = 40 Style = csDropDownList @@ -1834,8 +1841,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnKeyPress = MJstr3KeyPress end object baoNo: TEdit - Left = 293 - Top = 130 + Left = 61 + Top = 325 Width = 90 Height = 37 Font.Charset = GB2312_CHARSET @@ -1868,7 +1875,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Style = [fsBold] ParentFont = False TabOrder = 23 - Visible = False OnClick = Button7Click end object ComboBox2: TComboBox @@ -2088,7 +2094,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel4: TPanel Left = 0 Top = 0 - Width = 1362 + Width = 1370 Height = 81 Align = alTop BevelInner = bvRaised @@ -2097,14 +2103,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel5: TPanel Left = 2 Top = 2 - Width = 1358 + Width = 1366 Height = 77 Align = alClient TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1356 + Width = 1364 Height = 48 Align = alTop BevelInner = bvRaised @@ -2328,7 +2334,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1356 + Width = 1364 Height = 30 ButtonHeight = 30 ButtonWidth = 83 @@ -2348,16 +2354,133 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False ShowCaptions = True TabOrder = 1 - object ToolButton1: TToolButton + object Panel9: TPanel Left = 0 Top = 0 + Width = 545 + Height = 30 + BevelOuter = bvNone + Color = clSkyBlue + TabOrder = 0 + object Label49: TLabel + Left = 58 + Top = 7 + Width = 84 + Height = 20 + Caption = #21367#21495#33539#22260 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label50: TLabel + Left = 198 + Top = 3 + Width = 14 + Height = 25 + Caption = '-' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -25 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label53: TLabel + Left = 278 + Top = 8 + Width = 84 + Height = 20 + Caption = #21253#21495#33539#22260 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label54: TLabel + Left = 418 + Top = 5 + Width = 14 + Height = 25 + Caption = '-' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -25 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object MaxRollNo: TEdit + Left = 212 + Top = 1 + Width = 57 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 1 + OnClick = Edit1Click + end + object MinRollNo: TEdit + Left = 143 + Top = 1 + Width = 57 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 0 + OnClick = Edit1Click + end + object MinBaoNO: TEdit + Left = 363 + Top = 2 + Width = 57 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 2 + OnClick = Edit1Click + end + object MaxBaoNO: TEdit + Left = 434 + Top = 2 + Width = 57 + Height = 28 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 3 + OnClick = Edit1Click + end + end + object ToolButton1: TToolButton + Left = 545 + Top = 0 AutoSize = True Caption = #21047#26032 ImageIndex = 9 OnClick = ToolButton1Click end object TBCD: TToolButton - Left = 63 + Left = 608 Top = 0 AutoSize = True Caption = #30133#28857#31649#29702 @@ -2365,7 +2488,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = TBCDClick end object ToolButton3: TToolButton - Left = 150 + Left = 695 Top = 0 AutoSize = True Caption = #21024#38500 @@ -2373,7 +2496,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 213 + Left = 758 Top = 0 AutoSize = True Caption = #20462#25913 @@ -2381,7 +2504,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = ToolButton2Click end object TBClose: TToolButton - Left = 276 + Left = 821 Top = 0 AutoSize = True Caption = #20851#38381 @@ -2392,8 +2515,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object MovePanel1: TMovePanel - Left = 846 - Top = 157 + Left = 838 + Top = 189 Width = 391 Height = 300 BevelInner = bvLowered @@ -2645,7 +2768,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 353 Top = 81 Width = 284 - Height = 632 + Height = 640 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2654,7 +2777,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 280 - Height = 303 + Height = 311 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2763,7 +2886,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 305 + Top = 313 Width = 280 Height = 41 Align = alBottom @@ -2779,7 +2902,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 346 + Top = 354 Width = 280 Height = 284 Align = alBottom diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 93e3877..72f71c1 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -10,7 +10,20 @@ 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; + MovePanel, 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 TfrmMJManageNewFDNewSF = class(TForm) @@ -245,6 +258,16 @@ type BaoID: TEdit; Button7: TButton; ComboBox2: TComboBox; + Tv3baoNo: TcxGridDBColumn; + Panel9: TPanel; + Label49: TLabel; + Label50: TLabel; + Label53: TLabel; + Label54: TLabel; + MaxRollNo: TEdit; + MinRollNo: TEdit; + MinBaoNO: TEdit; + MaxBaoNO: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -308,7 +331,7 @@ type { Private declarations } FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer; FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string; - fRollType, flbtype: string; + fRollType, flbtype, fbaotype, fbaosx : string; isCommopen, IsJsMessage: boolean; MValue, FCDName: string; fxsws, fxsws1: string; @@ -322,6 +345,7 @@ type procedure AddSLNew(Fbtn: TSpeedButton); procedure AddCDNew(Fbtn: TSpeedButton); procedure SavedataCK(); + procedure PrtBaoData(FBaoid: string); procedure PrtData(FMJID: string); procedure OpenCom(DllName: string); procedure CloseCom(DllName: string); @@ -344,6 +368,97 @@ uses U_DataLink, U_Fun, U_ZDYHelp, U_iniParam, U_ClothHCList; {$R *.dfm} + +procedure TfrmMJManageNewFDNewSF.PrtBaoData(FBaoid: string); +var + fPrintFile: string; + Txt, fImagePath: string; + Moudle: THandle; + Makebar: TMakebar; + Mixtext: TMixtext; + i: Integer; +begin + if CDS_MJID.IsEmpty then + exit; + CDS_MJID.First; + with ADOQueryPrint do + begin + Close; + SQL.Clear; + sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,'); + SQL.Add('C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX, '); + sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),'); + sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); + sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); + sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), '); + sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), '); + sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); + sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); + sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); + sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); + SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); + sql.Add('from WFB_MJJY A'); + sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); + sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID'); + SQL.Add('where A.BaoID=''' + Trim(FBaoid) + ''''); + SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName'); + SQL.Add(',C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX '); + Open; + end; + if ADOQueryPrint.RecordCount > 1 then + begin + Application.MessageBox('´!', 'ʾ', 0); + Exit; + end; + if ADOQueryPrint.RecordCount < 1 then + begin + Application.MessageBox('˰Żδ棬뱣ݣڴӡ룡', 'ʾ', 0); + Exit; + end; + try + Moudle := LoadLibrary('MakeQRBarcode.dll'); + @Makebar := GetProcAddress(Moudle, 'Make'); + @Mixtext := GetProcAddress(Moudle, 'MixText'); + Txt := trim(FBaoid); + 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); + exit; + end; + + if Trim(ADOQueryPrint.fieldbyname('NLBName').AsString) <> '' then + begin + ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('NLBName').AsString), ADOCmd); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('NLBName').AsString + '.rmf' ) + end + else + begin + ExportFtErpFile('ǩ.rmf', ADOCmd); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ǩ.rmf'; + end; + + if not FileExists(fPrintFile) then + begin + Application.MessageBox(PChar('û' + fPrintFile), 'ʾ', 0); + Exit; + end; + + if FileExists(fPrintFile) then + begin + RMVariables['QRBARCODE'] := fImagePath; + RM2.LoadFromFile(fPrintFile); + RM2.DefaultCopies := 1; + //RM2.ShowReport; + RM2.printReport; + end; + +end; + procedure TfrmMJManageNewFDNewSF.On1301(var Message: Tmessage); var i1, i2: integer; @@ -1056,8 +1171,12 @@ begin FieldByName('MJTypeOther').Value := Trim(Label9.Caption); FieldByName('note').Value := Trim(note.Text); - // FieldByName('baoNO').Value:=Trim(baono.text); - // FieldByName('baoID').Value:=Trim(baoID.Text); + if fbaotype = 'ֶ' then + begin + FieldByName('baoNO').Value := Trim(baono.text); + FieldByName('baoID').Value := Trim(baoID.Text); + end; + Post; end; @@ -1171,7 +1290,35 @@ begin sql.Add('where MJID=''' + Trim(FMJID) + ''' '); execsql; end; - + + + if (fbaotype = 'ֶ') or (fbaotype = '') or (PState = 2) then + begin + + end + else + begin + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('exec P_Update_Bao ''' + trim(FMJID) + ''' '); + if fbaotype = '' then + begin + sql.Add(',1 '); + end + else if fbaotype = 'ɫ' then + begin + sql.Add(',2 '); + end + else if fbaotype = 'ɫ' then + begin + sql.Add(',3 '); + end; + execsql; + end; + end; + //SavedataCK(); ADOCmd.Connection.CommitTrans; Result := True; @@ -1361,6 +1508,43 @@ begin //end; end; + if Trim(Edit6.Text) = '' then + begin + if (fbaotype = 'ֶ') or (fbaotype = '') then + begin + + end + else + begin + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('exec P_View_Baoid ''' + trim(FFFMJID) + ''' '); + sql.Add(',''' + trim(FMainId) + ''' ,''' + trim(FSubId) + ''' '); + if fbaotype = '' then + begin + sql.Add(' ,1 '); + end; + if fbaotype = 'ɫ' then + begin + sql.Add(' ,2 '); + end; + if fbaotype = 'ɫ' then + begin + sql.Add(' ,3 '); + end; + Open; + end; + + if trim(ADOCmd.FieldByName('baoid').AsString) <> '' then + begin + PrtBaoData(ADOCmd.fieldbyname('baoid').AsString); + end; + end; + + end; + Label16.Caption := ''; BTAdd.Click; MJQty4.SetFocus; @@ -2109,10 +2293,13 @@ begin MJSJKZ.Text := Trim(ADOTmp.fieldbyname('PRTKZ').AsString); MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1); + fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString); + + fxsws := Trim(ADOTmp.fieldbyname('xsws').AsString); fxsws1 := Trim(ADOTmp.fieldbyname('xsws1').AsString); baoNO.Text := Trim(ADOTmp.fieldbyname('maxBaoNO').AsString); - if GetLSNo(ADOCmd, FBaoID, 'BI', 'WFB_MJJY', 3, 1) = False then + if GetLSNo(ADOCmd, FBaoID, 'BI', 'WFB_MJJY', 4, 1) = False then begin // ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('ȡʧܣ', 'ʾ', 0); @@ -2396,7 +2583,9 @@ begin begin Close; SQL.Clear; - sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,'); + sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,'); + SQL.Add('C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX, '); + sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),'); sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), '); @@ -2410,7 +2599,8 @@ begin sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID'); SQL.Add('where A.BaoID=''' + Trim(CDS_MJID.fieldbyname('baoID').AsString) + ''''); - SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName'); + SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,C.KHorderNo,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName'); + SQL.Add(',C.PRTCode,C.Sorddefstr5,C.PRTSpec,C.PRTMF,C.PRTKZ,C.PRTHX '); Open; end; if ADOQueryPrint.RecordCount > 1 then @@ -2449,7 +2639,7 @@ begin open; end; baoNo.Text := inttostr(ADOTmp.fieldbyname('maxbaoNO').AsInteger + 1); - if GetLSNo(ADOTmp, FBaoID, 'BI', 'WFB_MJJY', 3, 1) = False then + if GetLSNo(ADOTmp, FBaoID, 'BI', 'WFB_MJJY', 4, 1) = False then begin Application.MessageBox('ȡʧܣ', 'ʾ', 0); Exit; diff --git a/检验管理/U_OrderInPut.dfm b/检验管理/U_OrderInPut.dfm index aa3e180..e3b5c63 100644 --- a/检验管理/U_OrderInPut.dfm +++ b/检验管理/U_OrderInPut.dfm @@ -18,7 +18,7 @@ object frmOrderInPut: TfrmOrderInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1197 + Width = 1205 Height = 29 ButtonHeight = 30 ButtonWidth = 59 @@ -58,7 +58,7 @@ object frmOrderInPut: TfrmOrderInPut object ScrollBox1: TScrollBox Left = 0 Top = 29 - Width = 1197 + Width = 1205 Height = 288 Align = alTop BevelInner = bvNone @@ -1494,7 +1494,7 @@ object frmOrderInPut: TfrmOrderInPut object ToolBar2: TToolBar Left = 0 Top = 317 - Width = 1197 + Width = 1205 Height = 29 ButtonHeight = 30 ButtonWidth = 83 @@ -1541,12 +1541,12 @@ object frmOrderInPut: TfrmOrderInPut object cxGrid1: TcxGrid Left = 0 Top = 346 - Width = 1197 - Height = 270 + Width = 1205 + Height = 277 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView - NavigatorButtons.ConfirmDelete = False + Navigator.Buttons.CustomButtons = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = < diff --git a/检验管理/U_OrderInPut.pas b/检验管理/U_OrderInPut.pas index 66393fe..3d395b1 100644 --- a/检验管理/U_OrderInPut.pas +++ b/检验管理/U_OrderInPut.pas @@ -11,7 +11,21 @@ uses cxTextEdit, cxMaskEdit, cxButtonEdit, StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar,StrUtils, cxCurrencyEdit, cxImage, Menus, cxLookAndFeelPainters, cxButtons, cxDBEdit, cxGridCustomPopupMenu, - cxGridPopupMenu; + cxGridPopupMenu, cxLookAndFeels, 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, + cxNavigator; type TfrmOrderInPut = class(TForm) diff --git a/检验管理/U_ProductOrderLBNameSet.dfm b/检验管理/U_ProductOrderLBNameSet.dfm index 9156550..32dfaad 100644 --- a/检验管理/U_ProductOrderLBNameSet.dfm +++ b/检验管理/U_ProductOrderLBNameSet.dfm @@ -1,6 +1,6 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet - Left = 177 - Top = 123 + Left = 397 + Top = 451 Width = 1375 Height = 754 Caption = #26631#31614#35774#32622 @@ -20,7 +20,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1359 + Width = 1367 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 107 @@ -102,51 +103,60 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet AutoSize = True Caption = #30382#37325#35774#32622'(Kg)' ImageIndex = 60 + Wrap = True OnClick = ToolButton3Click end object ToolButton5: TToolButton - Left = 648 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25442#31639#31995#25968 ImageIndex = 60 OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 735 - Top = 0 + Left = 87 + Top = 30 AutoSize = True Caption = #38271#24230#20301#25968 ImageIndex = 60 OnClick = ToolButton6Click end object ToolButton9: TToolButton - Left = 822 - Top = 0 + Left = 174 + Top = 30 AutoSize = True Caption = #37325#37327#20301#25968 ImageIndex = 60 OnClick = ToolButton9Click end + object ToolButton11: TToolButton + Left = 261 + Top = 30 + AutoSize = True + Caption = #27599#21253#21367#25968 + ImageIndex = 60 + OnClick = ToolButton11Click + end object ToolButton7: TToolButton - Left = 909 - Top = 0 + Left = 348 + Top = 30 AutoSize = True Caption = #39044#35272#21367#26631#31614 ImageIndex = 12 OnClick = ToolButton7Click end object ToolButton8: TToolButton - Left = 1008 - Top = 0 + Left = 447 + Top = 30 AutoSize = True Caption = #39044#35272#21253#26631#31614 ImageIndex = 12 OnClick = ToolButton8Click end object PiZhong: TEdit - Left = 1107 - Top = 0 + Left = 546 + Top = 30 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -158,8 +168,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet TabOrder = 0 end object TBClose: TToolButton - Left = 1228 - Top = 0 + Left = 667 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -168,8 +178,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1359 + Top = 62 + Width = 1367 Height = 62 Align = alTop BevelInner = bvRaised @@ -406,8 +416,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet end object cxGrid1: TcxGrid Left = 0 - Top = 94 - Width = 1359 + Top = 124 + Width = 1367 Height = 545 Align = alTop TabOrder = 2 @@ -570,21 +580,21 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet DataBinding.FieldName = 'SOrddefstr1' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 60 + Width = 74 end object v1Column5: TcxGridDBColumn Caption = #38271#24230#20301#25968 DataBinding.FieldName = 'xsws' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 60 + Width = 83 end object v1Column6: TcxGridDBColumn Caption = #37325#37327#20301#25968 DataBinding.FieldName = 'XSWS1' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 60 + Width = 74 end object v1Column7: TcxGridDBColumn Caption = #20108#32500#30721#31867#22411 @@ -595,7 +605,7 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet #29305#27530) Properties.OnEditValueChanged = v1Column7PropertiesEditValueChanged HeaderAlignmentHorz = taCenter - Width = 70 + Width = 83 end object Tv1Column1: TcxGridDBColumn Caption = #29305#27530#23383#31526 @@ -603,7 +613,24 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = Tv1Column1PropertiesEditValueChanged HeaderAlignmentHorz = taCenter - Width = 65 + Width = 69 + end + object Tv1baotype: TcxGridDBColumn + Caption = #25171#21253#26041#24335 + DataBinding.FieldName = 'baotype' + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + #21333#21367#21333#21253 + #25163#21160#25171#21253 + #22810#21367#21333#33394) + Properties.OnEditValueChanged = Tv1baotypePropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1JS: TcxGridDBColumn + Caption = #27599#21253#21367#25968 + DataBinding.FieldName = 'JS' + HeaderAlignmentHorz = taCenter end end object cxGrid1Level1: TcxGridLevel diff --git a/检验管理/U_ProductOrderLBNameSet.pas b/检验管理/U_ProductOrderLBNameSet.pas index 54df747..ae308a6 100644 --- a/检验管理/U_ProductOrderLBNameSet.pas +++ b/检验管理/U_ProductOrderLBNameSet.pas @@ -10,7 +10,21 @@ uses cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, StrUtils, Menus, cxDropDownEdit, - cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + cxTextEdit, 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 TfrmProductOrderLBNameSet = class(TForm) @@ -96,6 +110,9 @@ type ToolButton10: TToolButton; v1Column7: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; + ToolButton11: TToolButton; + Tv1baotype: TcxGridDBColumn; + Tv1JS: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -127,6 +144,8 @@ type procedure ToolButton10Click(Sender: TObject); procedure v1Column7PropertiesEditValueChanged(Sender: TObject); procedure Tv1Column1PropertiesEditValueChanged(Sender: TObject); + procedure ToolButton11Click(Sender: TObject); + procedure Tv1baotypePropertiesEditValueChanged(Sender: TObject); private DQdate: TDateTime; procedure InitGrid(); @@ -1109,5 +1128,94 @@ begin end; +procedure TfrmProductOrderLBNameSet.ToolButton11Click(Sender: TObject); +var + FPiZhong: string; + FReal: Double; +begin + if Order_Main.IsEmpty then + exit; + if Order_Main.Locate('SSel', True, []) = False then + begin + Application.MessageBox('ûѡݣ', 'ʾ', 0); + Exit; + end; + if Trim(PiZhong.Text) = '' then + begin + Application.MessageBox('ÿΪ!', 'ʾ', 0); + Exit; + end; + if TryStrToFloat(PiZhong.Text, FReal) = False then + begin + Application.MessageBox('ÿǷ!', 'ʾ', 0); + Exit; + end; + with order_Main 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 JYOrder_Sub Set JS=' + Trim(PiZhong.Text)); + sql.Add(' where Subid=''' + Trim(Order_Main.fieldbyname('Subid').AsString) + ''''); + ExecSQL; + end; + with Order_Main do + begin + Edit; + FieldByName('JS').Value := PiZhong.Text; + Post; + end; + end; + next; + end; + end; + CheckBox1.Checked := False; + with Order_Main do + begin + DisableControls; + first; + while not Eof do + begin + edit; + fieldbyname('Ssel').AsBoolean := False; + post; + next; + end; + first; + EnableControls; + end; +end; + +procedure TfrmProductOrderLBNameSet.Tv1baotypePropertiesEditValueChanged( + Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('baotype').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update JYOrder_Main Set baotype=''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); + ExecSQL; + end; +end; + end. diff --git a/检验管理/U_ProductOrderNewList.dfm b/检验管理/U_ProductOrderNewList.dfm index c514a5a..ad9288d 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 @@ -155,7 +155,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object Panel1: TPanel Left = 0 Top = 32 - Width = 1366 + Width = 1374 Height = 41 Align = alTop BevelInner = bvRaised @@ -384,12 +384,12 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid1: TcxGrid Left = 0 Top = 95 - Width = 1366 + Width = 1374 Height = 334 Align = alTop TabOrder = 2 object Tv1: TcxGridDBTableView - NavigatorButtons.ConfirmDelete = False + Navigator.Buttons.CustomButtons = <> OnCellDblClick = Tv1CellDblClick OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DataSource1 @@ -708,8 +708,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 452 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -717,8 +717,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 460 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -726,12 +726,12 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 object TV2: TcxGridDBTableView - NavigatorButtons.ConfirmDelete = False + Navigator.Buttons.CustomButtons = <> OnFocusedRecordChanged = TV2FocusedRecordChanged DataController.DataSource = DataSource2 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -999,7 +999,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1029,19 +1029,20 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxTabControl1: TcxTabControl Left = 0 Top = 73 - Width = 1366 + Width = 1374 Height = 22 Align = alTop - Style = 9 - TabIndex = 0 TabOrder = 6 - Tabs.Strings = ( + Properties.CustomButtons.Buttons = <> + Properties.Style = 9 + Properties.TabIndex = 0 + Properties.Tabs.Strings = ( #26410#23436#25104 #24050#23436#25104 #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 22 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/检验管理/U_ProductOrderNewList.pas b/检验管理/U_ProductOrderNewList.pas index bd679b3..c81bd93 100644 --- a/检验管理/U_ProductOrderNewList.pas +++ b/检验管理/U_ProductOrderNewList.pas @@ -11,7 +11,22 @@ uses cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, - IdComponent, IdTCPConnection, IdTCPClient, IdFTP,shellAPI, cxPC; + IdComponent, IdTCPConnection, IdTCPClient, IdFTP,shellAPI, cxPC, + cxLookAndFeels, cxLookAndFeelPainters, 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, + cxNavigator, dxBarBuiltInMenu; type TfrmProductOrderNewList = class(TForm)