diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index a2893c8..912121b 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\D7W\Ŀ\D7djRuishun\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7djRuishun\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/TradeManage.dpr b/检验管理/TradeManage.dpr index 4ef9925..16cb2d0 100644 --- a/检验管理/TradeManage.dpr +++ b/检验管理/TradeManage.dpr @@ -3,10 +3,10 @@ library TradeManage; uses SysUtils, classes, - forms, - WinTypes, + forms, + WinTypes, WinProcs, - MidasLib, + MidasLib, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\..\..\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, diff --git a/检验管理/U_CKProductBCPOutList.dfm b/检验管理/U_CKProductBCPOutList.dfm index f40a85c..c83f32f 100644 --- a/检验管理/U_CKProductBCPOutList.dfm +++ b/检验管理/U_CKProductBCPOutList.dfm @@ -1,7 +1,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList - Left = 119 - Top = 120 - Width = 1378 + Left = 226 + Top = 149 + Width = 1719 Height = 754 Caption = #25104#21697#20986#24211#21015#34920 Color = clBtnFace @@ -20,7 +20,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1362 + Width = 1703 Height = 33 ButtonHeight = 30 ButtonWidth = 83 @@ -116,7 +116,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object Panel1: TPanel Left = 0 Top = 33 - Width = 1362 + Width = 1703 Height = 80 Align = alTop BevelInner = bvRaised @@ -381,7 +381,7 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList object cxGrid2: TcxGrid Left = 0 Top = 113 - Width = 1362 + Width = 1703 Height = 602 Align = alClient PopupMenu = PopupMenu1 diff --git a/检验管理/U_CKProductBCPOutList.pas b/检验管理/U_CKProductBCPOutList.pas index 4e212b6..d338d8b 100644 --- a/检验管理/U_CKProductBCPOutList.pas +++ b/检验管理/U_CKProductBCPOutList.pas @@ -11,7 +11,20 @@ uses ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, cxDropDownEdit, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxCheckBox, Menus, MovePanel, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + 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 TfrmCKProductBCPOutList = class(TForm) @@ -212,12 +225,13 @@ begin with ADOQueryMain do begin Filtered := False; - Close; + Close; sql.Clear; - SQL.Add('select A.*,cast(D.baono as varchar(20)) as Strbaono,B.OrderNo,C.PRTCodeName,C.PRTSpec,C.PRTColor,C.SOrddefstr1,C.PRTMF,C.PRTKZ,D.MJXH,D.baono as Fbaono , D.baoid as Fbaoid,C.PRTPrice,C.PRTHX '); - sql.Add(',C.SOrddefstr4,D.MJQty3,D.MJQty4'); - sql.Add(',PONO=(select Top 1 KHConNo from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)'); - sql.Add(',MPRTECodeName=(select Top 1 MPRTCodeName from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)'); + SQL.Add('select A.CPType,A.CRTime,A.KGQty,A.Qty,A.QtyUnit,A.CKOrdNo,A.CRNote,A.mjid,A.BCID,A.CRID'); + SQL.Add(',cast(D.baono as varchar(20)) as Strbaono,B.OrderNo,C.PRTCodeName,C.PRTSpec,C.PRTColor,C.SOrddefstr1,C.PRTMF,C.PRTKZ,D.MJXH,D.baono as Fbaono , D.baoid as Fbaoid,C.PRTPrice,C.PRTHX '); + sql.Add(',C.SOrddefstr4,D.MJQty3,D.MJQty4,D.baono'); +// sql.Add(',PONO=(select Top 1 KHConNo from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)'); +// sql.Add(',MPRTECodeName=(select Top 1 MPRTCodeName from JYOrderCon_Main JCM where JCM.ConNo=B.OrderNo)'); sql.Add(',isnull(customerNoName,B.OrderNo) KHName'); sql.Add(',D.mjstr4,D.MJstr5 '); sql.add('from CK_BanCP_CR A '); @@ -228,6 +242,7 @@ begin sql.add(' and A.CRTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + ''''); SQL.Add(' and CRType='''' '); // sql.Add('order by cast(dbo.Get_ShuZi(C.SOrddefstr1) as bigint)'); +// ShowMessage(sql.text); Open; end; SCreateCDS20(ADOQueryMain, CDS_Main); @@ -1257,10 +1272,11 @@ begin with ADOQueryCmd do begin Close; - sql.Clear; + sql.Clear; sql.Add(strsql); +// ShowMessage(SQL.text); ExecSQL - end; + end; CDS_Main.EnableControls; ADOQueryCmd.Connection.CommitTrans; MovePanel2.Visible := False; diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 2170c7c..08b1afc 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 146 - Top = 52 + Left = 239 + Top = 166 Width = 1382 Height = 754 Caption = #26816#39564#25253#21578 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index e3e9d14..d959edf 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -10,7 +10,20 @@ uses cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,Math; + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, Math, 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) @@ -1800,6 +1813,14 @@ begin sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update CK_BanCP_KC Set KCQty=''' + SL + ''' '); + sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + ExecSQL; + end; end; Next; end; @@ -1856,8 +1877,7 @@ begin InitGrid(); end; -procedure TfrmJYOrderCDOne.PRTCodeNameKeyPress(Sender: TObject; - var Key: Char); +procedure TfrmJYOrderCDOne.PRTCodeNameKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin diff --git a/检验管理/U_MJEdit.dfm b/检验管理/U_MJEdit.dfm index e0b6022..9f38544 100644 --- a/检验管理/U_MJEdit.dfm +++ b/检验管理/U_MJEdit.dfm @@ -323,11 +323,11 @@ object frmMJEdit: TfrmMJEdit Left = 0 Top = 105 Width = 854 - Height = 357 + Height = 356 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView - NavigatorButtons.ConfirmDelete = False + Navigator.Buttons.CustomButtons = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> diff --git a/检验管理/U_MJEdit.pas b/检验管理/U_MJEdit.pas index 6879962..4ac34d7 100644 --- a/检验管理/U_MJEdit.pas +++ b/检验管理/U_MJEdit.pas @@ -4,11 +4,24 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, - cxDataStorage, cxEdit, DB, cxDBData, cxTextEdit, DBClient, ADODB, - cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, - cxClasses, cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, - ComCtrls, ToolWin, cxButtonEdit; + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxTextEdit, DBClient, ADODB, cxGridLevel, + cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, + cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, ComCtrls, ToolWin, + cxButtonEdit, 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; type TfrmMJEdit = class(TForm) @@ -66,8 +79,7 @@ type procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormDestroy(Sender: TObject); procedure MJIDKeyPress(Sender: TObject; var Key: Char); - procedure tv2CDTypePropertiesButtonClick(Sender: TObject; - AButtonIndex: Integer); + procedure tv2CDTypePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure tv2CDWZPropertiesEditValueChanged(Sender: TObject); procedure v2Column2PropertiesEditValueChanged(Sender: TObject); procedure ToolButton1Click(Sender: TObject); @@ -78,7 +90,7 @@ type procedure ToolButton4Click(Sender: TObject); private { Private declarations } - function SaveData():Boolean; + function SaveData(): Boolean; public { Public declarations } end; @@ -87,24 +99,25 @@ var frmMJEdit: TfrmMJEdit; implementation + uses - U_Fun,U_ZDYHelp,U_DataLink; + U_Fun, U_ZDYHelp, U_DataLink; {$R *.dfm} procedure TfrmMJEdit.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmMJEdit.FormDestroy(Sender: TObject); begin - frmMJEdit:=nil; + frmMJEdit := nil; end; procedure TfrmMJEdit.MJIDKeyPress(Sender: TObject; var Key: Char); begin - if Key=#13 then + if Key = #13 then begin with ADOTmp do begin @@ -112,77 +125,76 @@ begin sql.Clear; SQL.Add('select A.*,AOrddefstr3=(select AOrddefstr3 from JYOrder_Sub_AnPai B where B.APID=A.APID), '); sql.Add('AOrddefstr2=(select AOrddefstr2 from JYOrder_Sub_AnPai B where B.APID=A.APID) from WFB_MJJY A'); - sql.Add(' where A.MJID='''+Trim(MJID.Text)+''''); + sql.Add(' where A.MJID=''' + Trim(MJID.Text) + ''''); Open; end; if ADOTmp.IsEmpty then begin - MJID.Text:=''; - Label2.Caption:=''; - Label2.Visible:=False; - Application.MessageBox('!','ʾ',0); + MJID.Text := ''; + Label2.Caption := ''; + Label2.Visible := False; + Application.MessageBox('!', 'ʾ', 0); Exit; end; - MJstr4.Text:=Trim(ADOTmp.fieldbyname('MJstr4').AsString); - MJXH.Text:=Trim(ADOTmp.fieldbyname('MJXH').AsString); - MJMaoZ.Text:=Trim(ADOTmp.fieldbyname('MJMaoZ').AsString); - MJLen.Text:=Trim(ADOTmp.fieldbyname('MJLen').AsString); - MJQty1.Text:=Trim(ADOTmp.fieldbyname('MJQty1').AsString); - MJQty2.Text:=Trim(ADOTmp.fieldbyname('MJQty2').AsString); - MJQty4.Text:=Trim(ADOTmp.fieldbyname('MJQty4').AsString); - MJFK.Text:=Trim(ADOTmp.fieldbyname('MJFK').AsString); - MJSJKZ.Text:=Trim(ADOTmp.fieldbyname('MJSJKZ').AsString); - M.Caption:=Trim(Trim(ADOTmp.fieldbyname('MJTypeOther').AsString)); - Ma.Caption:=Trim(Trim(ADOTmp.fieldbyname('MJStr1').AsString)); - if Trim(m.Caption)='' then + MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString); + MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString); + MJMaoZ.Text := Trim(ADOTmp.fieldbyname('MJMaoZ').AsString); + MJLen.Text := Trim(ADOTmp.fieldbyname('MJLen').AsString); + MJQty1.Text := Trim(ADOTmp.fieldbyname('MJQty1').AsString); + MJQty2.Text := Trim(ADOTmp.fieldbyname('MJQty2').AsString); + MJQty4.Text := Trim(ADOTmp.fieldbyname('MJQty4').AsString); + MJFK.Text := Trim(ADOTmp.fieldbyname('MJFK').AsString); + MJSJKZ.Text := Trim(ADOTmp.fieldbyname('MJSJKZ').AsString); + M.Caption := Trim(Trim(ADOTmp.fieldbyname('MJTypeOther').AsString)); + Ma.Caption := Trim(Trim(ADOTmp.fieldbyname('MJStr1').AsString)); + if Trim(m.Caption) = '' then begin - m.Caption:=Trim(ADOTmp.fieldbyname('AOrddefstr3').AsString); + m.Caption := Trim(ADOTmp.fieldbyname('AOrddefstr3').AsString); end; - if Trim(Ma.Caption)='' then + if Trim(Ma.Caption) = '' then begin - Ma.Caption:=Trim(ADOTmp.fieldbyname('AOrddefstr2').AsString); + Ma.Caption := Trim(ADOTmp.fieldbyname('AOrddefstr2').AsString); end; - if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString))='Ʒ' then + if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = 'Ʒ' then begin - RadioGroup1.ItemIndex:=0 - end else - if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString))='Ʒ' then + RadioGroup1.ItemIndex := 0 + end + else if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = 'Ʒ' then begin - RadioGroup1.ItemIndex:=1; - end else - if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString))='' then + RadioGroup1.ItemIndex := 1; + end + else if Trim(Trim(ADOTmp.fieldbyname('MJType').AsString)) = '' then begin - RadioGroup1.ItemIndex:=2; + RadioGroup1.ItemIndex := 2; end; with ADOTmp do begin Close; sql.Clear; - SQL.Add('select * from WFB_MJJY_CD A where A.MJID='''+Trim(MJID.Text)+''''); + SQL.Add('select * from WFB_MJJY_CD A where A.MJID=''' + Trim(MJID.Text) + ''''); Open; end; - Label2.Caption:=Trim(MJID.Text); - Label2.Visible:=True; - MJID.Text:=''; - SCreateCDS20(ADOTmp,Order_MJ); - SInitCDSData20(ADOTmp,Order_MJ); + Label2.Caption := Trim(MJID.Text); + Label2.Visible := True; + MJID.Text := ''; + SCreateCDS20(ADOTmp, Order_MJ); + SInitCDSData20(ADOTmp, Order_MJ); end; end; -procedure TfrmMJEdit.tv2CDTypePropertiesButtonClick(Sender: TObject; - AButtonIndex: Integer); +procedure TfrmMJEdit.tv2CDTypePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='WFBCD'; - flagname:='õ'; - if ShowModal=1 then + flag := 'WFBCD'; + flagname := 'õ'; + if ShowModal = 1 then begin Self.Order_MJ.Edit; - Self.Order_MJ.FieldByName('CDName').value:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + Self.Order_MJ.FieldByName('CDName').value := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; end; finally @@ -192,36 +204,37 @@ end; procedure TfrmMJEdit.tv2CDWZPropertiesEditValueChanged(Sender: TObject); var - mvalue,CDBeg,CDEnd:string; - FFReal:Double; + mvalue, CDBeg, CDEnd: string; + FFReal: Double; begin - mvalue:=TcxTextEdit(Sender).EditingText; + mvalue := TcxTextEdit(Sender).EditingText; with Order_MJ do begin Edit; - FieldByName('CDBeg').Value:=mvalue; + FieldByName('CDBeg').Value := mvalue; Post; end; - CDBeg:=Trim(Order_MJ.fieldbyname('CDBeg').AsString); - CDEnd:=Trim(Order_MJ.fieldbyname('CDEnd').AsString); - if (Trim(CDBeg)<>'') and (Trim(CDEnd)<>'') then + CDBeg := Trim(Order_MJ.fieldbyname('CDBeg').AsString); + CDEnd := Trim(Order_MJ.fieldbyname('CDEnd').AsString); + if (Trim(CDBeg) <> '') and (Trim(CDEnd) <> '') then begin - if TryStrToFloat(CDBeg,FFReal) and TryStrToFloat(CDBeg,FFReal) then + if TryStrToFloat(CDBeg, FFReal) and TryStrToFloat(CDBeg, FFReal) then begin - if StrToFloat(CDEnd)'') and (Trim(CDEnd)<>'') then + CDBeg := Trim(Order_MJ.fieldbyname('CDBeg').AsString); + CDEnd := Trim(Order_MJ.fieldbyname('CDEnd').AsString); + if (Trim(CDBeg) <> '') and (Trim(CDEnd) <> '') then begin - if TryStrToFloat(CDBeg,FFReal) and TryStrToFloat(CDBeg,FFReal) then + if TryStrToFloat(CDBeg, FFReal) and TryStrToFloat(CDBeg, FFReal) then begin - if StrToFloat(CDEnd)'' then + if Trim(Label2.Caption) = '' then + Exit; + if Order_MJ.IsEmpty then + Exit; + if Trim(Order_MJ.fieldbyname('MCID').AsString) <> '' then begin - if Application.MessageBox('ȷҪɾ','ʾ',32+4)<>IDYES then Exit; + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + Exit; with ADOCmd do begin Close; sql.Clear; - sql.Add('delete WFB_MJJY_CD where MCID='''+Trim(Order_MJ.fieldbyname('MCID').AsString)+''''); + sql.Add('delete WFB_MJJY_CD where MCID=''' + Trim(Order_MJ.fieldbyname('MCID').AsString) + ''''); ExecSQL; end; end; Order_MJ.Delete; end; -function TfrmMJEdit.SaveData():Boolean; +function TfrmMJEdit.SaveData(): Boolean; var - maxno:String; - FFreal:Double; + maxno: string; + FFreal: Double; begin try ADOCmd.Connection.BeginTrans; @@ -302,88 +320,89 @@ begin First; while not Eof do begin - if Trim(Order_MJ.fieldbyname('MCID').AsString)='' then + if Trim(Order_MJ.fieldbyname('MCID').AsString) = '' then begin - if GetLSNo(ADOTmp,maxno,'MC','WFB_MJJY_CD',5,1)=False then + if GetLSNo(ADOTmp, maxno, 'MC', 'WFB_MJJY_CD', 5, 1) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ȡˮʧܣ','ʾ',0); + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); Exit; end; - end else + end + else begin - maxno:=Trim(Order_MJ.fieldbyname('MCID').AsString); + maxno := Trim(Order_MJ.fieldbyname('MCID').AsString); end; with ADOCmd do begin Close; SQL.Clear; sql.Add('select * from WFB_MJJY_CD '); - sql.Add(' where MCID='''+Trim(maxno)+''''); + sql.Add(' where MCID=''' + Trim(maxno) + ''''); Open; end; with ADOCmd do begin - if Trim(Order_MJ.fieldbyname('MCID').AsString)='' then + if Trim(Order_MJ.fieldbyname('MCID').AsString) = '' then Append else Edit; - FieldByName('MJId').Value:=Trim(Label2.Caption); - FieldByName('MCID').Value:=Trim(maxno); - SSetSaveDataCDSNew(ADOCmd,Tv2,Order_MJ,'WFB_MJJY_CD',0); - FieldByName('KouFenQty').Value:=Order_MJ.fieldbyname('KouFenQty').AsInteger; - FieldByName('JBQty').Value:=Order_MJ.fieldbyname('JBQty').AsFloat; + FieldByName('MJId').Value := Trim(Label2.Caption); + FieldByName('MCID').Value := Trim(maxno); + SSetSaveDataCDSNew(ADOCmd, Tv2, Order_MJ, 'WFB_MJJY_CD', 0); + FieldByName('KouFenQty').Value := Order_MJ.fieldbyname('KouFenQty').AsInteger; + FieldByName('JBQty').Value := Order_MJ.fieldbyname('JBQty').AsFloat; Post; end; Order_MJ.Edit; - Order_MJ.FieldByName('MCID').Value:=Trim(maxno); - Order_MJ.FieldByName('MJID').Value:=Trim(Label2.Caption); + Order_MJ.FieldByName('MCID').Value := Trim(maxno); + Order_MJ.FieldByName('MJID').Value := Trim(Label2.Caption); Next; end; end; - if Trim(MJMaoZ.Text)<>'' then + if Trim(MJMaoZ.Text) <> '' then begin - if TryStrToFloat(MJMaoZ.Text,FFreal)=False then + if TryStrToFloat(MJMaoZ.Text, FFreal) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('Ƿ!','ʾ',0); + Application.MessageBox('Ƿ!', 'ʾ', 0); Exit; end; end; - if Trim(MJLen.Text)<>'' then + if Trim(MJLen.Text) <> '' then begin - if TryStrToFloat(MJLen.Text,FFreal)=False then + if TryStrToFloat(MJLen.Text, FFreal) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ȷǷ!','ʾ',0); + Application.MessageBox('ȷǷ!', 'ʾ', 0); Exit; end; end; - if Trim(MJSJKZ.Text)<>'' then + if Trim(MJSJKZ.Text) <> '' then begin - if TryStrToFloat(MJSJKZ.Text,FFreal)=False then + if TryStrToFloat(MJSJKZ.Text, FFreal) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('طǷ!','ʾ',0); + Application.MessageBox('طǷ!', 'ʾ', 0); Exit; end; end; - if Trim(MJQty2.Text)<>'' then + if Trim(MJQty2.Text) <> '' then begin - if TryStrToFloat(MJQty2.Text,FFreal)=False then + if TryStrToFloat(MJQty2.Text, FFreal) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('Ƿ!','ʾ',0); + Application.MessageBox('Ƿ!', 'ʾ', 0); Exit; end; end; - if Trim(MJQty4.Text)<>'' then + if Trim(MJQty4.Text) <> '' then begin - if TryStrToFloat(MJQty4.Text,FFreal)=False then + if TryStrToFloat(MJQty4.Text, FFreal) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('طǷ!','ʾ',0); + Application.MessageBox('طǷ!', 'ʾ', 0); Exit; end; end; @@ -391,69 +410,122 @@ begin begin Close; sql.Clear; - sql.Add('UPdate WFB_MJJY Set MJTypeOther='''+Trim(M.Caption)+''''); - sql.Add(',MJStr1='''+Trim(Ma.Caption)+''''); - sql.Add(',MJStr4='''+Trim(MJStr4.Text)+''''); - sql.Add(',MJXH='''+Trim(MJXH.Text)+''''); - if Trim(MJLen.Text)<>'' then + sql.Add('UPdate WFB_MJJY Set MJTypeOther=''' + Trim(M.Caption) + ''''); + sql.Add(',MJStr1=''' + Trim(Ma.Caption) + ''''); + sql.Add(',MJStr4=''' + Trim(MJStr4.Text) + ''''); + sql.Add(',MJXH=''' + Trim(MJXH.Text) + ''''); + if Trim(MJLen.Text) <> '' then begin - sql.Add(',MJLen='+Trim(MJLen.Text)); - end else + sql.Add(',MJLen=' + Trim(MJLen.Text)); + end + else begin sql.Add(',MJLen=0'); end; - if Trim(MJQty1.Text)<>'' then + if Trim(MJQty1.Text) <> '' then begin - sql.Add(',MJQty1='+Trim(MJQty1.Text)); - end else + sql.Add(',MJQty1=' + Trim(MJQty1.Text)); + end + else begin sql.Add(',MJQty1=0'); end; - if Trim(MJQty2.Text)<>'' then + if Trim(MJQty2.Text) <> '' then begin - sql.Add(',MJQty2='+Trim(MJQty2.Text)); - end else + sql.Add(',MJQty2=' + Trim(MJQty2.Text)); + end + else begin sql.Add(',MJQty2=0'); end; - if Trim(MJFK.Text)<>'' then + if Trim(MJFK.Text) <> '' then begin - sql.Add(',MJFK='''+Trim(MJFK.Text)+''''); - end else + sql.Add(',MJFK=''' + Trim(MJFK.Text) + ''''); + end + else begin sql.Add(',MJFK=0'); end; - if Trim(MJMaoZ.Text)<>'' then + if Trim(MJMaoZ.Text) <> '' then begin - sql.Add(',MJMaoZ='+Trim(MJMaoZ.Text)); - end else + sql.Add(',MJMaoZ=' + Trim(MJMaoZ.Text)); + end + else begin sql.Add(',MJMaoZ=0'); end; - if Trim(MJSJKZ.Text)<>'' then + if Trim(MJSJKZ.Text) <> '' then begin - sql.Add(',MJSJKZ='+Trim(MJSJKZ.Text)); - end else + sql.Add(',MJSJKZ=' + Trim(MJSJKZ.Text)); + end + else begin sql.Add(',MJSJKZ=0'); end; - if Trim(MJQty4.Text)<>'' then + if Trim(MJQty4.Text) <> '' then begin - sql.Add(',MJQty4='+Trim(MJQty4.Text)); - end else + sql.Add(',MJQty4=' + Trim(MJQty4.Text)); + end + else begin sql.Add(',MJQty4=0'); end; - if RadioGroup1.ItemIndex=0 then + if RadioGroup1.ItemIndex = 0 then begin sql.Add(',MJType=''Ʒ'' '); - end else - if RadioGroup1.ItemIndex=1 then + end + else if RadioGroup1.ItemIndex = 1 then begin sql.Add(',MJType=''Ʒ'' '); end; - sql.Add(' where MJID='''+Trim(Label2.Caption)+''''); -// ShowMessage(SQL.Text); + sql.Add(' where MJID=''' + Trim(Label2.Caption) + ''''); + + sql.Add('UPdate CK_BanCP_CR Set QtyUnit=''' + Trim(M.Caption) + ''''); + if Trim(MJLen.Text) <> '' then + begin + sql.Add(',Qty=' + Trim(MJLen.Text)); + end + else + begin + sql.Add(',Qty=0'); + end; + if Trim(MJMaoZ.Text) <> '' then + begin + sql.Add(',KGQty=' + Trim(MJMaoZ.Text)); + end + else + begin + sql.Add(',KGQty=0'); + end; + if RadioGroup1.ItemIndex = 0 then + begin + sql.Add(',CPType=''Ʒ'' '); + end + else if RadioGroup1.ItemIndex = 1 then + begin + sql.Add(',CPType=''Ʒ'' '); + end; + sql.Add(' where MJID=''' + Trim(Label2.Caption) + ''''); + + sql.Add('UPdate CK_BanCP_KC Set KCQtyUnit=''' + Trim(M.Caption) + ''''); + if Trim(MJLen.Text) <> '' then + begin + sql.Add(',KCQty=' + Trim(MJLen.Text)); + end + else + begin + sql.Add(',KCQty=0'); + end; + if Trim(MJMaoZ.Text) <> '' then + begin + sql.Add(',KCKGQty=' + Trim(MJMaoZ.Text)); + end + else + begin + sql.Add(',KCKGQty=0'); + end; + sql.Add(' where MJID=''' + Trim(Label2.Caption) + ''''); +// ShowMessage(SQL.Text); ExecSQL; end; with ADOCmd do @@ -461,37 +533,38 @@ begin close; sql.Clear; sql.Add('update WFB_MJJY SET CDList= dbo.F_Get_Order_SubStr(MJID,''MJCDHZSL'')'); - sql.Add(' where MJID='''+Trim(Label2.Caption)+''''); + sql.Add(' where MJID=''' + Trim(Label2.Caption) + ''''); execsql; end; ADOCmd.Connection.CommitTrans; - Result:=True; + Result := True; except - Result:=False; + Result := False; ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ʧܣ','ʾ',0); + Application.MessageBox('ʧܣ', 'ʾ', 0); end; end; procedure TfrmMJEdit.ToolButton2Click(Sender: TObject); begin - if Trim(Label2.Caption)='' then Exit; + if Trim(Label2.Caption) = '' then + Exit; if SaveData() then begin - Application.MessageBox('ɹ!','ʾ',0); - self.ModalResult:=1; + Application.MessageBox('ɹ!', 'ʾ', 0); + self.ModalResult := 1; end; end; procedure TfrmMJEdit.TBCloseClick(Sender: TObject); begin Close; - WriteCxGrid('ƥ',Tv2,'Ⱦ'); + WriteCxGrid('ƥ', Tv2, 'Ⱦ'); end; procedure TfrmMJEdit.FormShow(Sender: TObject); begin - ReadCxGrid('ƥ',Tv2,'Ⱦ'); + ReadCxGrid('ƥ', Tv2, 'Ⱦ'); end; procedure TfrmMJEdit.ToolButton4Click(Sender: TObject); @@ -500,28 +573,30 @@ begin begin Close; sql.Clear; - sql.Add('select * from CK_BanCP_CR where MJID='''+Trim(Label2.Caption)+''''); + sql.Add('select * from CK_BanCP_CR where MJID=''' + Trim(Label2.Caption) + ''''); Open; end; - if ADOTmp.IsEmpty=False then + if ADOTmp.IsEmpty = False then begin - Application.MessageBox('Ѳݲɾ!','ʾ',0); + Application.MessageBox('Ѳݲɾ!', 'ʾ', 0); Exit; - end else + end + else begin - if Application.MessageBox('ȷҪϺݲָܻ','ʾ',32+4)=IDYES then + if Application.MessageBox('ȷҪϺݲָܻ', 'ʾ', 32 + 4) = IDYES then begin with ADOCmd do begin Close; sql.Clear; - sql.Add('delete WFB_MJJY where MJID='''+Trim(Label2.Caption)+''''); - sql.Add('delete WFB_MJJY_CD where MJID='''+Trim(Label2.Caption)+''''); + sql.Add('delete WFB_MJJY where MJID=''' + Trim(Label2.Caption) + ''''); + sql.Add('delete WFB_MJJY_CD where MJID=''' + Trim(Label2.Caption) + ''''); ExecSQL; end; - Label2.Caption:=''; + Label2.Caption := ''; end; end; end; end. + diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index c519fa5..3921a4d 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, BtnEdit; + MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, BtnEdit, + 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) @@ -1156,7 +1170,6 @@ begin end; end - else begin with ADOCmd do @@ -2213,8 +2226,7 @@ begin FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString); FKJ := ADOTmp.fieldbyname('PRTKJ').AsFloat; FKJZ := ADOTmp.fieldbyname('PRTKJZ').AsFloat; - AOrdDefNote1.Text := 'װҪ:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13 - //+':'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13 + AOrdDefNote1.Text := 'װҪ:' + #13 + Trim(ADOTmp.fieldbyname('MPRTBZNote').AsString) + #13 //+':'+Trim(ADOTmp.fieldbyname('MPRTYaoFeng').AsString)+#13 //+'̽:'+Trim(ADOTmp.fieldbyname('MPRTTangJin').AsString)+#13 //+':'+Trim(ADOTmp.fieldbyname('MPRTKaiJian').AsString)+#13 // +'ŷ:'+Trim(ADOTmp.fieldbyname('PRTMF').AsString)+#13 @@ -2380,12 +2392,10 @@ begin MJXH.Text := Trim(fieldbyname('maxRoll').AsString); end; end - else if fRollType = '޹' then begin end - else begin with ADOCmd do @@ -2498,7 +2508,19 @@ begin Application.MessageBox('ֻɾµļ!', 'ʾ', 0); Exit; end; - + with ADOTmp do + begin + Close; + sql.Clear; + sql.Add('select * from CK_BanCP_CR where MJID=''' + Trim(CDS_MJID.fieldbyname('MJID').AsString) + ''' and CRFlag='''' '); + Open; + end; + if ADOTmp.IsEmpty = False then + begin + CDS_MJID.EnableControls; + Application.MessageBox('ݲɾ!', 'ʾ', 0); + Exit; + end; if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then Exit; @@ -2509,6 +2531,7 @@ begin sql.Add('delete WFB_MJJY where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' '); sql.Add('delete WFB_MJJY_CD where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' '); sql.Add('delete CK_BanCP_CR where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' '); + sql.Add('delete CK_BanCP_KC where MJID=''' + trim(CDS_MJID.fieldbyName('MJID').AsString) + ''' '); sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); sql.Add(' ' + quotedstr(trim(DName))); sql.Add(',getdate() '); @@ -2601,7 +2624,7 @@ begin RM2.LoadFromFile(fPrintFile); RM2.DefaultCopies := 1; //RM2.ShowReport; - RM2.printReport; + RM2.printReport; end; end;