diff --git a/云翔一码通/U_YMTFHSQInPut.dfm b/云翔一码通/U_YMTFHSQInPut.dfm index 54ac3a6..4b44939 100644 --- a/云翔一码通/U_YMTFHSQInPut.dfm +++ b/云翔一码通/U_YMTFHSQInPut.dfm @@ -1,6 +1,6 @@ object frmFHSQInPut: TfrmFHSQInPut - Left = 444 - Top = 375 + Left = 598 + Top = 707 Width = 1499 Height = 664 Caption = #21457#36135#30003#35831#24405#20837 @@ -419,6 +419,12 @@ object frmFHSQInPut: TfrmFHSQInPut HeaderAlignmentHorz = taCenter Width = 106 end + object Tv1FHPrice: TcxGridDBColumn + Caption = #21333#20215 + DataBinding.FieldName = 'FHPrice' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/云翔一码通/U_YMTFHSQInPut.pas b/云翔一码通/U_YMTFHSQInPut.pas index 75516a9..d167a53 100644 --- a/云翔一码通/U_YMTFHSQInPut.pas +++ b/云翔一码通/U_YMTFHSQInPut.pas @@ -64,6 +64,7 @@ type ToolButton3: TToolButton; Label3: TLabel; JGType: TEdit; + Tv1FHPrice: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/云翔一码通/U_YMTFHSQInPut2.dfm b/云翔一码通/U_YMTFHSQInPut2.dfm index 930aa9f..81e05d8 100644 --- a/云翔一码通/U_YMTFHSQInPut2.dfm +++ b/云翔一码通/U_YMTFHSQInPut2.dfm @@ -1,6 +1,6 @@ object frmFHSQInPut2: TfrmFHSQInPut2 - Left = 766 - Top = 507 + Left = 328 + Top = 610 Width = 1499 Height = 664 Caption = #21457#36135#30003#35831#24405#20837 diff --git a/云翔一码通/U_YMTFHSQList.dfm b/云翔一码通/U_YMTFHSQList.dfm index 6d808a3..a199e04 100644 --- a/云翔一码通/U_YMTFHSQList.dfm +++ b/云翔一码通/U_YMTFHSQList.dfm @@ -1,6 +1,6 @@ object frmYMTFHSQList: TfrmYMTFHSQList - Left = 499 - Top = 184 + Left = 566 + Top = 427 Width = 1308 Height = 679 Caption = #21457#36135#30003#35831 @@ -21,6 +21,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList Left = 0 Top = 0 Width = 1300 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 115 @@ -92,46 +93,86 @@ object frmYMTFHSQList: TfrmYMTFHSQList AutoSize = True Caption = #21024#38500 ImageIndex = 3 + Wrap = True OnClick = TBDelClick end object tchk: TToolButton - Left = 593 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #23457#26680 ImageIndex = 75 OnClick = tchkClick end object Tnochk: TToolButton - Left = 672 - Top = 0 + Left = 79 + Top = 30 AutoSize = True Caption = #25764#38144#23457#26680 ImageIndex = 52 OnClick = TnochkClick end object TBPrint: TToolButton - Left = 791 - Top = 0 + Left = 198 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 4 OnClick = TBPrintClick end + object PrintMD: TToolButton + Left = 277 + Top = 30 + Caption = #25171#21360#30721#21333 + ImageIndex = 4 + OnClick = PrintMDClick + end + object Panel4: TPanel + Left = 392 + Top = 30 + Width = 249 + Height = 30 + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + TabOrder = 0 + object Label12: TLabel + Left = 8 + Top = 7 + Width = 80 + Height = 19 + Caption = #30721#21333#21517#31216 + end + object MDName: TComboBox + Left = 94 + Top = 2 + Width = 145 + Height = 27 + ItemHeight = 19 + TabOrder = 0 + end + end object TBClose: TToolButton - Left = 870 - Top = 0 + Left = 641 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 21 OnClick = TBCloseClick end + object OutStock: TToolButton + Left = 720 + Top = 30 + Caption = #26680#38144#20986#24211 + ImageIndex = 8 + OnClick = OutStockClick + end end object cxGrid1: TcxGrid Left = 0 - Top = 108 + Top = 119 Width = 1300 - Height = 282 + Height = 271 Align = alClient TabOrder = 2 object Tv1: TcxGridDBTableView @@ -379,9 +420,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object Panel1: TPanel Left = 0 - Top = 32 + Top = 62 Width = 1300 - Height = 76 + Height = 57 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered @@ -401,7 +442,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList ParentFont = False end object Label4: TLabel - Left = 274 + Left = 592 Top = 15 Width = 80 Height = 19 @@ -414,8 +455,8 @@ object frmYMTFHSQList: TfrmYMTFHSQList ParentFont = False end object Label5: TLabel - Left = 292 - Top = 45 + Left = 418 + Top = 15 Width = 60 Height = 19 Caption = #19994#21153#21592 @@ -427,8 +468,8 @@ object frmYMTFHSQList: TfrmYMTFHSQList ParentFont = False end object Label2: TLabel - Left = 85 - Top = 45 + Left = 251 + Top = 15 Width = 11 Height = 19 Caption = '-' @@ -440,7 +481,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList ParentFont = False end object Label3: TLabel - Left = 469 + Left = 786 Top = 15 Width = 80 Height = 19 @@ -453,9 +494,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList ParentFont = False end object BegDate: TDateTimePicker - Left = 101 - Top = 12 - Width = 125 + Left = 108 + Top = 11 + Width = 135 Height = 27 Date = 40675.464742650460000000 Format = 'yyyy-MM-dd' @@ -471,9 +512,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList OnChange = BegDateChange end object EndDate: TDateTimePicker - Left = 101 - Top = 42 - Width = 125 + Left = 270 + Top = 11 + Width = 135 Height = 27 Date = 40675.464761099540000000 Format = 'yyyy-MM-dd' @@ -490,7 +531,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object SHDanWei: TEdit Tag = 2 - Left = 363 + Left = 675 Top = 11 Width = 98 Height = 27 @@ -506,8 +547,8 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object Salesman: TEdit Tag = 2 - Left = 363 - Top = 40 + Left = 481 + Top = 11 Width = 98 Height = 27 Font.Charset = GB2312_CHARSET @@ -522,8 +563,8 @@ object frmYMTFHSQList: TfrmYMTFHSQList end object ComboBox1: TComboBox Tag = 7 - Left = 555 - Top = 10 + Left = 869 + Top = 11 Width = 101 Height = 27 Font.Charset = GB2312_CHARSET diff --git a/云翔一码通/U_YMTFHSQList.pas b/云翔一码通/U_YMTFHSQList.pas index 57495da..6c2bea6 100644 --- a/云翔一码通/U_YMTFHSQList.pas +++ b/云翔一码通/U_YMTFHSQList.pas @@ -24,7 +24,7 @@ uses dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, - dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue; + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, BtnEdit; type TfrmYMTFHSQList = class(TForm) @@ -112,6 +112,11 @@ type Tv1Column1: TcxGridDBColumn; TbAdd2: TToolButton; Tv2Column1: TcxGridDBColumn; + OutStock: TToolButton; + PrintMD: TToolButton; + Panel4: TPanel; + Label12: TLabel; + MDName: TComboBox; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -136,12 +141,16 @@ type procedure Button3Click(Sender: TObject); procedure btnChkClick(Sender: TObject); procedure TbAdd2Click(Sender: TObject); + procedure OutStockClick(Sender: TObject); + procedure PrintMDClick(Sender: TObject); private procedure InitGrid(); procedure InitSubGrid(); procedure InitForm(); function DelData(): Boolean; procedure SendMessage(Mfsid: string); + function BatchStockOut(FSID: string; UserID: string): Boolean; + { Private declarations } public FFInt: Integer; @@ -155,9 +164,83 @@ var implementation uses - U_DataLink, U_YMTFHSQInPut, U_Fun, U_ZDYHelp, U_LabelPrintFun, U_YMTFHSQInPut2; + U_DataLink, U_YMTFHSQInPut, U_Fun, U_ZDYHelp, U_LabelPrintFun, U_YMTFHSQInPut2, + superobject; {$R *.dfm} +function TfrmYMTFHSQList.BatchStockOut(FSID: string; UserID: string): Boolean; +var + IdHttp: TIdHTTP; + Url, ResponseStr: string; + ResponseStream: TStringStream; + vJson1: ISuperObject; +begin + Result := False; + +// ֤ + if Trim(FSID) = '' then + begin + ShowMessage('MXIDΪ'); + Exit; + end; + + if Trim(UserID) = '' then + begin + ShowMessage('ûIDΪ'); + Exit; + end; + + IdHttp := TIdHTTP.Create(nil); + ResponseStream := TStringStream.Create(''); + try + try + // GET - ҪContentType + // ֱӷURL + // ӿURLURLУ + Url := 'http://www.rightsoft.top/YunXiang/api/YMTCK/batchStockOut?' + 'FSID=' + Trim(FSID) + '&userid=' + Trim(UserID); +// ShowMessage(Url); + // GET + IdHttp.Get(Url, ResponseStream); + + // ȡӦ + ResponseStr := ResponseStream.DataString; + + // JSONӦ + vJson1 := SO(ResponseStr); +// ShowMessage(ResponseStr); + if (vJson1.O['code'] <> nil) then + begin + if (vJson1.O['code'].AsInteger = 10000) then + begin + Result := True; + ShowMessage('Զɹ'); + end + else + begin + // ȡϢ + if vJson1.O['message'] <> nil then + ShowMessage('Զʧ: ' + vJson1.O['message'].AsString) + else + ShowMessage('Զʧܣδ֪'); + end; + end + else + begin + ShowMessage('ӿڷظʽ'); + end; + + except + on e: Exception do + begin + ShowMessage('쳣: ' + e.Message); + end; + end; + + finally + IdHttp.Free; + ResponseStream.Free; + end; +end; procedure TfrmYMTFHSQList.SendMessage(Mfsid: string); begin @@ -311,11 +394,14 @@ begin begin TBAdd.Visible := True; TBAdd2.Visible := False; + OutStock.Visible := False; end else if Trim(Self.Caption) = 'ӹǼ' then begin TBAdd2.Visible := True; TBAdd.Visible := False; + PrintMD.Visible := False; + Panel4.Visible := False; end; end; @@ -475,14 +561,14 @@ begin if Order_Main.IsEmpty then Exit; - msql := ' select A.*,B.* from YMT_FHSQ_Main A inner join YMT_FHSQ_Sub B on A.FSId=B.FSId where A.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + ''''; + msql := ' select A.*,B.* from YMT_FHSQ_Main A inner join YMT_FHSQ_Sub B on A.FSId=B.FSId where A.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + ''''; if Trim(Self.Caption) = '۷' then begin MPrintJson := '{ "LBName": "۷뵥","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }'; end else if Trim(Self.Caption) = 'ӹǼ' then begin - MPrintJson := '{ "LBName": "ӹ뵥","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }'; + MPrintJson := '{ "LBName": "ӹ뵥","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }'; end; FunPrint(Application, PChar(MPrintJson)); @@ -754,5 +840,56 @@ begin InitGrid(); end; +procedure TfrmYMTFHSQList.OutStockClick(Sender: TObject); +var + MFSID: string; + Result: Integer; +begin + if Order_Main.IsEmpty then + Exit; + MFSID := Order_Main.fieldbyname('FSID').AsString; + + if MFSID <> '' then + begin + // ʾȷȡťϢ + Result := Application.MessageBox(PChar('ǷҪ뵥Ϊ' + Trim(MFSID) + 'ļӹȫ'), 'ʾ', MB_OKCANCEL + MB_ICONQUESTION // ȷȡť + ʺͼ + ); + + // ûȡť + if Result = IDCANCEL then + Exit; // ˳ǰ + if not BatchStockOut(MFSID, Trim(DCode)) then + begin + Application.MessageBox('ʧ!', 'ʾ', 0); + Exit; + end; + end; + +end; + +procedure TfrmYMTFHSQList.PrintMDClick(Sender: TObject); +var + fPrintFile, FCKNO, msql, MPrintJson: string; +begin + if Order_Main.IsEmpty then + Exit; + + if Order_Main.Locate('ssel', True, []) = false then + begin + application.MessageBox('ûѡ', 'ʾ'); + exit; + end; + if Trim(MDName.Text) = '' then + begin + Application.MessageBox('뵥ƲΪ!', 'ʾ', 0); + Exit; + end; + + msql := 'SELECT A.* FROM YMT_CK_CR A LEFT JOIN YMT_FHSQ_Sub S ON A.ToSSID=S.SSId LEFT JOIN YMT_FHSQ_Main M ON M.FSId=S.FSId WHERE A.CRType=''۳'' AND M.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + ''''; + MPrintJson := '{ "LBName": "' + Trim(MDName.Text) + '","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }'; + + FunPrint(Application, PChar(MPrintJson)); +end; + end. diff --git a/云翔一码通/U_YMTRKInPut.dfm b/云翔一码通/U_YMTRKInPut.dfm index d91008f..22d1579 100644 --- a/云翔一码通/U_YMTRKInPut.dfm +++ b/云翔一码通/U_YMTRKInPut.dfm @@ -656,9 +656,6 @@ object frmYMTRKInPut: TfrmYMTRKInPut Column = TvMXMXQty end> DataController.Summary.FooterSummaryItems = < - item - Kind = skCount - end item Kind = skSum Column = TvMXMXQty diff --git a/云翔一码通/U_YMTRKInPut.pas b/云翔一码通/U_YMTRKInPut.pas index 933546a..a2ccc79 100644 --- a/云翔一码通/U_YMTRKInPut.pas +++ b/云翔一码通/U_YMTRKInPut.pas @@ -23,7 +23,7 @@ uses dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter, cxNavigator, cxCurrencyEdit, IdBaseComponent, IdComponent, - IdTCPConnection, IdTCPClient, IdHTTP; + IdTCPConnection, IdTCPClient, IdHTTP, StrUtils; type TfrmYMTRKInPut = class(TForm) @@ -151,7 +151,7 @@ type public { Public declarations } FBCId: string; - PState, CopyInt: Integer; + PState, CopyFlag: Integer; FSelectedSPIDs: TStringList; // ڱѡеSPID end; @@ -353,7 +353,7 @@ begin FieldByName('YFID').Value := Trim(YFID); FieldByName('YFTypeId').Value := Trim(CDS_Sub.fieldbyname('SPID').AsString); FieldByName('CRID').Value := StrToInt(CRID); - FieldByName('YFName').Value := 'ɹ'; + FieldByName('YFName').Value := Trim(CDS_Sub.fieldbyname('CRType').AsString); FieldByName('Filler').Value := Trim(DName); FieldByName('CRType').Value := 'ӦǼ'; FieldByName('CRFlag').Value := 'Ӧ'; @@ -494,8 +494,10 @@ end; procedure TfrmYMTRKInPut.InitGrid(); var SPIDList: string; + MMaxno: string; i: Integer; begin + // жѡеSPIDINѯ if Assigned(FSelectedSPIDs) and (FSelectedSPIDs.Count > 0) then begin @@ -535,6 +537,26 @@ begin SCreateCDS20(ADOQueryTemp, CDS_Sub); SInitCDSData20(ADOQueryTemp, CDS_Sub); + if CopyFlag = 99 then + begin + if GetLSNo(ADOQueryCmd, MMaxno, 'DR', 'YMT_CK_CR', 3, 1) = False then + begin + Application.MessageBox('ȡ첼ʧ!', 'ʾ', 0); + Exit; + end; + + with CDS_Sub do + begin + Edit; + FieldByName('PiQty').Value := '0'; + FieldByName('Qty').Value := '0'; + FieldByName('KGQty').Value := '0'; + FieldByName('FactMQty').Value := '0'; + FieldByName('Money').Value := '0'; + FieldByName('SPID').Value := Trim(MMaxno); + post; + end; + end; if CDS_Sub.IsEmpty then Exit; @@ -640,6 +662,7 @@ begin Application.MessageBox('ȡ첼ʧ!', 'ʾ', 0); Exit; end; + if CDS_Sub.IsEmpty = False then begin CopyAddRowCDS(CDS_Sub); @@ -759,33 +782,10 @@ begin end; //////////Ӧ - YFData(); + //ú˼ǰIJںеĻ± + if AnsiIndexStr(Trim(CDS_Sub.fieldbyname('CRType').AsString), ['', 'ӹ', '', 'ɹ', 'ͻ˻']) >= 0 then + YFData(); -// with ADOQueryCmd do -// begin -// Close; -// sql.Clear; -// sql.Add('Update YMT_CK_CR Set MXKCQty=(select sum(isnull(Qty,0)*CRQtyFlag) from YMT_CK_MX A where A.SPID=YMT_CK_CR.SPID)'); -// sql.Add(',MXKCPiQty=(select sum(isnull(PiQty,0)*CRQtyFlag) from YMT_CK_MX A where A.SPID=YMT_CK_CR.SPID)'); -// sql.Add(' where SPID=''' + Trim(Maxno) + ''''); -// ExecSQL; -// end; - -// with ADOQueryTemp do -// begin -// Close; -// sql.Clear; -// sql.Add('select * from YMT_CK_CR where SPID=''' + Trim(Maxno) + ''''); -// Open; -// end; -// -// if ADOQueryTemp.FieldByName('MXKCQty').Value < 0 then -// begin -// CDS_Sub.DisableControls; -// ADOQueryCmd.Connection.RollbackTrans; -// Application.MessageBox('Сڳܱ!', 'ʾ', 0); -// Exit; -// end; /////////////////////////////////////////////////////////////////////////// /// ӱ with CDS_MX do @@ -1384,7 +1384,7 @@ begin if ReadMQty.Checked = False then FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100 else - FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[1].asFloat * FieldByName('Yardwand').Asfloat / 100; + FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[0] * FieldByName('Yardwand').Asfloat / 100; end else begin @@ -1539,7 +1539,7 @@ begin sql.Add('delete YMT_CK_MX where MXID=' + quotedstr(Trim(CDS_MX.FieldByName('MXID').AsString))); ExecSQL; end; - + with ADOQueryCmd do begin Close; @@ -1622,7 +1622,8 @@ begin if ReadMQty.Checked = False then CDS_Sub.FieldByName('FactMQty').Value := CDS_Sub.FieldByName('Qty').Asfloat * CDS_Sub.FieldByName('Yardwand').Asfloat / 100 else - CDS_Sub.FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[1].asFloat * CDS_Sub.FieldByName('Yardwand').Asfloat / 100; +// ShowMessage(TvMX.DataController.Summary.FooterSummaryValues[0] * CDS_Sub.FieldByName('Yardwand').Asfloat / 100); + CDS_Sub.FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[0] * CDS_Sub.FieldByName('Yardwand').Asfloat / 100; CDS_Sub.Post; end; diff --git a/云翔一码通/U_YMTRKList.dfm b/云翔一码通/U_YMTRKList.dfm index 36bd86d..7b47e93 100644 --- a/云翔一码通/U_YMTRKList.dfm +++ b/云翔一码通/U_YMTRKList.dfm @@ -1,6 +1,6 @@ object frmYMTRKList: TfrmYMTRKList - Left = 695 - Top = 340 + Left = 921 + Top = 456 Width = 1470 Height = 823 Caption = #20837#24211#30331#35760 @@ -70,16 +70,24 @@ object frmYMTRKList: TfrmYMTRKList ImageIndex = 11 OnClick = TBEditClick end - object TbEditKW: TToolButton + object ToolButton3: TToolButton Left = 252 Top = 0 AutoSize = True + Caption = #22797#21046 + ImageIndex = 25 + OnClick = ToolButton3Click + end + object TbEditKW: TToolButton + Left = 315 + Top = 0 + AutoSize = True Caption = #25209#37327#20462#25913#24211#20301 ImageIndex = 11 OnClick = TbEditKWClick end object TBDel: TToolButton - Left = 363 + Left = 426 Top = 0 AutoSize = True Caption = #21024#38500 @@ -87,7 +95,7 @@ object frmYMTRKList: TfrmYMTRKList OnClick = TBDelClick end object TBExport: TToolButton - Left = 426 + Left = 489 Top = 0 AutoSize = True Caption = #23548#20986 @@ -95,7 +103,7 @@ object frmYMTRKList: TfrmYMTRKList OnClick = TBExportClick end object TBClose: TToolButton - Left = 489 + Left = 552 Top = 0 AutoSize = True Caption = #20851#38381 @@ -103,7 +111,7 @@ object frmYMTRKList: TfrmYMTRKList OnClick = TBCloseClick end object ToolButton1: TToolButton - Left = 552 + Left = 615 Top = 0 AutoSize = True Caption = #39044#35272#25171#21360 @@ -111,7 +119,7 @@ object frmYMTRKList: TfrmYMTRKList OnClick = ToolButton1Click end object ToolButton2: TToolButton - Left = 639 + Left = 702 Top = 0 AutoSize = True Caption = #24555#36895#25171#21360 diff --git a/云翔一码通/U_YMTRKList.pas b/云翔一码通/U_YMTRKList.pas index 4e4e730..b4a406f 100644 --- a/云翔一码通/U_YMTRKList.pas +++ b/云翔一码通/U_YMTRKList.pas @@ -153,6 +153,7 @@ type Label16: TLabel; MXID: TEdit; ADOQueryMX: TADOQuery; + ToolButton3: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -185,6 +186,7 @@ type procedure SureClick(Sender: TObject); procedure QuitClick(Sender: TObject); procedure MXIDKeyPress(Sender: TObject; var Key: Char); + procedure ToolButton3Click(Sender: TObject); private canshu1, canshu2: string; procedure InitGrid(); @@ -999,5 +1001,38 @@ begin end; +procedure TfrmYMTRKList.ToolButton3Click(Sender: TObject); +var + OldSPID: string; // ڱ浱ǰеSPID +begin + if CDS_Main.IsEmpty then + Exit; + + try + OldSPID := Trim(CDS_Main.fieldbyname('SPID').AsString); + frmYMTRKInPut := TfrmYMTRKInPut.Create(Application); + with frmYMTRKInPut do + begin + PState := 1; + CopyFlag := 99; + FBCId := OldSPID; + if ShowModal = 1 then + begin + + end; + end; + InitGrid(); + // ¶λԭ + if not CDS_Main.Locate('SPID', OldSPID, []) then + begin + // Ҳԭ¼类ɾλһ¼ + if not CDS_Main.IsEmpty then + CDS_Main.First; + end; + finally + frmYMTRKInPut.Free; + end; +end; + end. diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm index 09b26fd..5353330 100644 --- a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm +++ b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm @@ -230,7 +230,7 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng Font.Style = [fsBold] ParentFont = False TabOrder = 2 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = cxTabSheet2 Properties.CustomButtons.Buttons = <> Properties.Style = 8 ClientRectBottom = 118 diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas index 611ec9a..e315e9b 100644 --- a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas +++ b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas @@ -4,30 +4,28 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, - cxDataStorage, cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, - cxGridTableView, cxGridDBTableView, cxClasses, cxControls, - cxGridCustomView, cxGrid, cxMemo, cxRichEdit, ComCtrls, cxContainer, - cxTextEdit, cxMaskEdit, cxButtonEdit, StdCtrls, ToolWin, DBClient, ADODB, - ExtCtrls, BtnEdit, cxCalendar,StrUtils, cxDropDownEdit,jpeg, - IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, cxPC, - cxGridCustomPopupMenu, cxGridPopupMenu, cxGroupBox, cxCheckBox, - RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport,IniFiles, Menus, - cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinBlack, - dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, - dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, - dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, - dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, - dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView, + cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxMemo, + cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit, + StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, + cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection, + IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, cxGroupBox, + cxCheckBox, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, + IniFiles, Menus, 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, - dxBarBuiltInMenu, cxNavigator; + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, + dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, + dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue, dxSkinscxPCPainter, dxBarBuiltInMenu, cxNavigator; type TfrmKuWeiInPutCeng = class(TForm) @@ -99,22 +97,24 @@ type procedure N2Click(Sender: TObject); private procedure InitData(); - function SaveData():Boolean; - function SaveDataDuoCeng():Boolean; - procedure PrtData(KWID:String); + function SaveData(): Boolean; + function SaveDataDuoCeng(): Boolean; + procedure PrtData(KWID: string); { Private declarations } public - canshu1:String; - PState:Integer; - FMainId:String; + canshu1: string; + PState: Integer; + FMainId: string; { Public declarations } end; var frmKuWeiInPutCeng: TfrmKuWeiInPutCeng; + implementation + uses - U_DataLink,U_ZDYHelp,U_RTFun; + U_DataLink, U_ZDYHelp, U_RTFun; {$R *.dfm} @@ -131,35 +131,34 @@ begin sql.Clear; sql.Add(' select * '); sql.Add(' from KuWei '); - if Trim(QuYu.Text)='' then + if Trim(QuYu.Text) = '' then begin sql.Add(' where 1=2'); - end else + end + else begin - sql.Add(' where isnull(QuYu,'''')='''+Trim(QuYu.Text)+''''); + sql.Add(' where isnull(QuYu,'''')=''' + Trim(QuYu.Text) + ''''); end; - if Trim(FenQu.Text)<>'' then + if Trim(FenQu.Text) <> '' then begin - sql.Add(' and isnull(FenQu,'''')='''+Trim(FenQu.Text)+''''); + sql.Add(' and isnull(FenQu,'''')=''' + Trim(FenQu.Text) + ''''); end; sql.Add(' and Valid=''Y'' '); Open; end; - SCreateCDS20(ADOQuery1,ClientDataSet1); - SInitCDSData20(ADOQuery1,ClientDataSet1); + SCreateCDS20(ADOQuery1, ClientDataSet1); + SInitCDSData20(ADOQuery1, ClientDataSet1); end; - - procedure TfrmKuWeiInPutCeng.FormShow(Sender: TObject); begin InitData(); end; -function TfrmKuWeiInPutCeng.SaveData():Boolean; +function TfrmKuWeiInPutCeng.SaveData(): Boolean; var - maxno,PaiStr:String; - i:Integer; + maxno, PaiStr: string; + i: Integer; begin with ADOTemp do begin @@ -168,44 +167,45 @@ begin sql.Add('select KWID from KuWei where 1=2'); open; end; - SCreateCDS20(ADOTemp,ClientDataSet2); - SInitCDSData20(ADOTemp,ClientDataSet2); - Result:=False; + SCreateCDS20(ADOTemp, ClientDataSet2); + SInitCDSData20(ADOTemp, ClientDataSet2); + Result := False; try ADOCmd.Connection.BeginTrans; /// - for i:=1 to StrToInt(CengQty.Text) do + for i := 1 to StrToInt(CengQty.Text) do begin - if GetLSNoHZ(ADOCmd,maxno,'KW','KuWei',4,0,0)=False then + if GetLSNoHZ(ADOCmd, maxno, 'KW', 'KuWei', 4, 0, 0) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ȡλʧ!','ʾ',0); + Application.MessageBox('ȡλʧ!', 'ʾ', 0); Exit; end; with ADOCmd do begin Close; sql.Clear; - SQL.Add('select * from KuWei where KWId='''+Trim(maxno)+''''); + SQL.Add('select * from KuWei where KWId=''' + Trim(maxno) + ''''); Open; end; with ADOCmd do begin Append; - FieldByName('KWId').Value:=Trim(maxno); - FieldByName('KWType').Value:='GG';//ҹ - FieldByName('Filler').Value:=Trim(DName); - FieldByName('FillerCode').Value:=Trim(DCode); - FieldByName('QuYu').Value:=Trim(QuYu.Text); - FieldByName('FenQu').Value:=Trim(FenQu.Text); - if StrToInt(Pai.Text)<10 then + FieldByName('KWId').Value := Trim(maxno); + FieldByName('KWType').Value := 'GG'; //ҹ + FieldByName('Filler').Value := Trim(DName); + FieldByName('FillerCode').Value := Trim(DCode); + FieldByName('QuYu').Value := Trim(QuYu.Text); + FieldByName('FenQu').Value := Trim(FenQu.Text); + if StrToInt(Pai.Text) < 10 then begin - FieldByName('Pai').Value:='0'+Trim(IntToStr(StrToInt(Pai.Text))); - end else + FieldByName('Pai').Value := '0' + Trim(IntToStr(StrToInt(Pai.Text))); + end + else begin - FieldByName('Pai').Value:=Trim(Pai.Text); + FieldByName('Pai').Value := Trim(Pai.Text); end; - FieldByName('Valid').Value:='Y'; + FieldByName('Valid').Value := 'Y'; Post; end; with ADOCmd do @@ -213,18 +213,19 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set KWNoInt=isnull((select max(KWNoInt) from KuWei '); - sql.Add(' where KWType=''GG'' and isnull(QuYu,'''')='''+Trim(QuYu.Text)+''''); - sql.Add(' and isnull(FenQu,'''')='''+Trim(FenQu.Text)+''''); - if StrToInt(Pai.Text)<10 then + sql.Add(' where KWType=''GG'' and isnull(QuYu,'''')=''' + Trim(QuYu.Text) + ''''); + sql.Add(' and isnull(FenQu,'''')=''' + Trim(FenQu.Text) + ''''); + if StrToInt(Pai.Text) < 10 then begin - PaiStr:='0'+Trim(IntToStr(strtoint(Pai.Text))); - end else + PaiStr := '0' + Trim(IntToStr(strtoint(Pai.Text))); + end + else begin - PaiStr:=Trim(Pai.Text) + PaiStr := Trim(Pai.Text) end; - sql.Add(' and isnull(Pai,'''')='''+PaiStr+''''); + sql.Add(' and isnull(Pai,'''')=''' + PaiStr + ''''); sql.Add(' and Valid=''Y''),0)+1'); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ADOCmd do @@ -232,7 +233,7 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set KWNo=''0''+RTrim(Cast(KWNoInt As varchar(10))) '); - sql.Add(' where KWID='''+Trim(maxno)+''' and KWNoInt<10'); + sql.Add(' where KWID=''' + Trim(maxno) + ''' and KWNoInt<10'); ExecSQL; end; with ADOCmd do @@ -240,7 +241,7 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set KWNo=RTrim(Cast(KWNoInt As varchar(10))) '); - sql.Add(' where KWID='''+Trim(maxno)+''' and KWNoInt>9'); + sql.Add(' where KWID=''' + Trim(maxno) + ''' and KWNoInt>9'); ExecSQL; end; with ADOCmd do @@ -248,7 +249,7 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set Ceng=KWNo '); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ADOCmd do @@ -257,18 +258,18 @@ begin sql.Clear; sql.Add('Update KuWei Set KWName=RTrim(isnull(QuYu,''''))+''-''+RTrim(isnull(FenQu,''''))+''-'' '); sql.Add('+RTrim(isnull(Pai,''''))+''-''+RTrim(isnull(Ceng,''''))+'''' '); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ClientDataSet2 do begin Append; - FieldByName('KWID').Value:=Trim(maxno); + FieldByName('KWID').Value := Trim(maxno); Post; end; end; ADOCmd.Connection.CommitTrans; - if Trim(PrtFlag.Text)<>'' then + if Trim(PrtFlag.Text) <> '' then begin with ClientDataSet2 do begin @@ -280,17 +281,18 @@ begin end; end; end; - Result:=True; + Result := True; except - Result:=False; + Result := False; ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ʧܣ','ʾ',0); + Application.MessageBox('ʧܣ', 'ʾ', 0); end; end; -function TfrmKuWeiInPutCeng.SaveDataDuoCeng():Boolean; + +function TfrmKuWeiInPutCeng.SaveDataDuoCeng(): Boolean; var - maxno,PaiStr:String; - p,c,i,PInt:Integer; + maxno, PaiStr: string; + p, c, i, PInt: Integer; begin with ADOTemp do begin @@ -299,76 +301,78 @@ begin sql.Add('select KWID from KuWei where 1=2'); open; end; - SCreateCDS20(ADOTemp,ClientDataSet2); - SInitCDSData20(ADOTemp,ClientDataSet2); - Result:=False; + SCreateCDS20(ADOTemp, ClientDataSet2); + SInitCDSData20(ADOTemp, ClientDataSet2); + Result := False; try ADOCmd.Connection.BeginTrans; /// - for P:=1 to StrToInt(PaiQty.Text) do + for p := 1 to StrToInt(PaiQty.Text) do begin - for C:=1 to StrToInt(CengQty.Text) do + for c := 1 to StrToInt(CengQty.Text) do begin - if GetLSNoHZ(ADOCmd,maxno,'KW','KuWei',4,0,0)=False then + if GetLSNoHZ(ADOCmd, maxno, 'KW', 'KuWei', 4, 0, 0) = False then begin ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ȡλʧ!','ʾ',0); + Application.MessageBox('ȡλʧ!', 'ʾ', 0); Exit; end; with ADOCmd do begin Close; sql.Clear; - SQL.Add('select * from KuWei where KWId='''+Trim(maxno)+''''); + SQL.Add('select * from KuWei where KWId=''' + Trim(maxno) + ''''); Open; end; with ADOCmd do begin Append; - FieldByName('KWId').Value:=Trim(maxno); - FieldByName('KWType').Value:='GG';//ҹ - FieldByName('Filler').Value:=Trim(DName); - FieldByName('FillerCode').Value:=Trim(DCode); - FieldByName('QuYu').Value:=Trim(QuYu.Text); - FieldByName('FenQu').Value:=Trim(FenQu.Text); - if c<10 then + FieldByName('KWId').Value := Trim(maxno); + FieldByName('KWType').Value := 'GG'; //ҹ + FieldByName('Filler').Value := Trim(DName); + FieldByName('FillerCode').Value := Trim(DCode); + FieldByName('QuYu').Value := Trim(QuYu.Text); + FieldByName('FenQu').Value := Trim(FenQu.Text); + if c < 10 then begin - FieldByName('Ceng').Value:='0'+Trim(IntToStr(c)); - end else + FieldByName('Ceng').Value := '0' + Trim(IntToStr(c)); + end + else begin - FieldByName('Ceng').Value:=Trim(IntToStr(c)); + FieldByName('Ceng').Value := Trim(IntToStr(c)); end; - FieldByName('Valid').Value:='Y'; + FieldByName('Valid').Value := 'Y'; Post; end; // - if C=1 then + if c = 1 then begin with ADOCmd do begin Close; sql.Clear; sql.Add('select AA=isnull(Cast(max(Pai) as int),0)+1 from KuWei where KWType=''GG'' '); - sql.Add(' and isnull(QuYu,'''')='''+Trim(QuYu.Text)+''''); - sql.Add(' and isnull(FenQu,'''')='''+Trim(FenQu.Text)+''''); + sql.Add(' and isnull(QuYu,'''')=''' + Trim(QuYu.Text) + ''''); + sql.Add(' and isnull(FenQu,'''')=''' + Trim(FenQu.Text) + ''''); sql.Add(' and valid=''Y'' '); Open; end; - PInt:=ADOCmd.fieldbyname('AA').Value; - if PInt<10 then + PInt := ADOCmd.fieldbyname('AA').Value; + if PInt < 10 then begin - PaiStr:='0'+Trim(IntToStr(PInt)); - end else + PaiStr := '0' + Trim(IntToStr(PInt)); + end + else begin - PaiStr:=Trim(IntToStr(PInt)); + PaiStr := Trim(IntToStr(PInt)); end; end; with ADOCmd do begin Close; sql.Clear; - sql.Add('Update KuWei Set Pai='''+Trim(PaiStr)+''''); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add('Update KuWei Set Pai=''' + Trim(PaiStr) + ''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; // @@ -377,7 +381,7 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set KWNo=Ceng '); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ADOCmd do @@ -385,7 +389,7 @@ begin Close; sql.Clear; sql.Add('Update KuWei Set KWNoInt=Cast(Ceng as int) '); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ADOCmd do @@ -394,20 +398,20 @@ begin sql.Clear; sql.Add('Update KuWei Set KWName=RTrim(isnull(QuYu,''''))+''-''+RTrim(isnull(FenQu,''''))+''-'' '); sql.Add('+RTrim(isnull(Pai,''''))+''-''+RTrim(isnull(Ceng,''''))+'''' '); - sql.Add(' where KWID='''+Trim(maxno)+''''); + sql.Add(' where KWID=''' + Trim(maxno) + ''''); ExecSQL; end; with ClientDataSet2 do begin Append; - FieldByName('KWID').Value:=Trim(maxno); + FieldByName('KWID').Value := Trim(maxno); Post; end; end; end; ADOCmd.Connection.CommitTrans; - if Trim(PrtFlag.Text)<>'' then + if Trim(PrtFlag.Text) <> '' then begin with ClientDataSet2 do begin @@ -419,188 +423,190 @@ begin end; end; end; - Result:=True; + Result := True; except - Result:=False; + Result := False; ADOCmd.Connection.RollbackTrans; - Application.MessageBox('ʧܣ','ʾ',0); + Application.MessageBox('ʧܣ', 'ʾ', 0); end; end; -procedure TfrmKuWeiInPutCeng.PrtData(KWID:String); + +procedure TfrmKuWeiInPutCeng.PrtData(KWID: string); var - fPrintFile,Txt,fImagePath:string; - i,j:Integer; - Moudle: THandle; - Makebar:TMakebar; - Mixtext:TMixtext; + fPrintFile, Txt, fImagePath: string; + i, j: Integer; + Moudle: THandle; + Makebar: TMakebar; + Mixtext: TMixtext; begin - fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\λǩ.rmf'; - if FileExists(fPrintFile)=False then + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\λǩ.rmf'; + if FileExists(fPrintFile) = False then begin - Application.MessageBox(PChar('û'+ExtractFilePath(Application.ExeName)+'Report\λǩ.rmf'),'ʾ',0); + Application.MessageBox(PChar('û' + ExtractFilePath(Application.ExeName) + 'Report\λǩ.rmf'), 'ʾ', 0); exit; end; with ADOTemp do begin Close; SQL.Clear; - sql.Add('select * from KuWei where KWID='''+Trim(KWID)+''''); + sql.Add('select * from KuWei where KWID=''' + Trim(KWID) + ''''); Open; end; - SCreateCDS20(ADOTemp,CDS_Print); - SInitCDSData20(ADOTemp,CDS_Print); + SCreateCDS20(ADOTemp, CDS_Print); + SInitCDSData20(ADOTemp, CDS_Print); try - Moudle:=LoadLibrary('MakeQRBarcode.dll'); - @Makebar:=GetProcAddress(Moudle,'Make'); - @Mixtext:=GetProcAddress(Moudle,'MixText'); - Txt:=Trim(KWID); - 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); + Moudle := LoadLibrary('MakeQRBarcode.dll'); + @Makebar := GetProcAddress(Moudle, 'Make'); + @Mixtext := GetProcAddress(Moudle, 'MixText'); + Txt := Trim(KWID); + 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); + application.MessageBox('άʧܣ', 'ʾϢ', MB_ICONERROR); exit; end; - RMVariables['QRBARCODE']:=fImagePath; - if Trim(ComboBox1.Text)='' then + RMVariables['QRBARCODE'] := fImagePath; + if Trim(ComboBox1.Text) = '' then begin - RMVariables['FangXiang']:=''; - end else - if Trim(ComboBox1.Text)='' then + RMVariables['FangXiang'] := ''; + end + else if Trim(ComboBox1.Text) = '' then begin - RMVariables['FangXiang']:=''; + RMVariables['FangXiang'] := ''; end; RM1.LoadFromFile(fPrintFile); //RM1.ShowReport; RM1.PrintReport; end; -Procedure TfrmKuWeiInPutCeng.FormClose(Sender: TObject; - var Action: TCloseAction); -begin - ModalResult:=1; -end; +procedure TfrmKuWeiInPutCeng.FormClose(Sender: TObject; var Action: TCloseAction); +begin + ModalResult := 1; +end; procedure TfrmKuWeiInPutCeng.PrtFlagClick(Sender: TObject); begin - if Trim(PrtFlag.Text)='' then + if Trim(PrtFlag.Text) = '' then begin - PrtFlag.Text:=''; - end else + PrtFlag.Text := ''; + end + else begin - PrtFlag.Text:=''; + PrtFlag.Text := ''; end; end; procedure TfrmKuWeiInPutCeng.Button1Click(Sender: TObject); var - FInt:Integer; + FInt: Integer; begin - if Trim(QuYu.Text)='' then + if Trim(QuYu.Text) = '' then begin - Application.MessageBox('Ϊ!','ʾ',0); + Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; - if Trim(FenQu.Text)='' then + if Trim(FenQu.Text) = '' then begin - Application.MessageBox('Ϊ!','ʾ',0); + Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; - if cxPageControl1.ActivePageIndex=0 then + if cxPageControl1.ActivePageIndex = 0 then begin - if Trim(pai.Text)='' then + if Trim(pai.Text) = '' then begin - Application.MessageBox('ڼŲΪ!','ʾ',0); + Application.MessageBox('ڼŲΪ!', 'ʾ', 0); Exit; end; - if TryStrToInt(pai.Text,FInt)=False then + if TryStrToInt(pai.Text, FInt) = False then begin - Application.MessageBox('ڼŷǷ!','ʾ',0); + Application.MessageBox('ڼŷǷ!', 'ʾ', 0); Exit; end; - if StrToInt(pai.Text)>299 then + if StrToInt(pai.Text) > 299 then begin - Application.MessageBox('ڼŲܴ300','ʾ',0); + Application.MessageBox('ڼŲܴ300', 'ʾ', 0); Exit; end; - end else - if cxPageControl1.ActivePageIndex=1 then + end + else if cxPageControl1.ActivePageIndex = 1 then begin - if Trim(paiQty.Text)='' then + if Trim(paiQty.Text) = '' then begin - Application.MessageBox('Ϊ!','ʾ',0); + Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; - if TryStrToInt(paiQty.Text,FInt)=False then + if TryStrToInt(paiQty.Text, FInt) = False then begin - Application.MessageBox('Ƿ!','ʾ',0); + Application.MessageBox('Ƿ!', 'ʾ', 0); Exit; end; - if StrToInt(paiQty.Text)>299 then + if StrToInt(paiQty.Text) > 299 then begin - Application.MessageBox('ܴ300','ʾ',0); + Application.MessageBox('ܴ300', 'ʾ', 0); Exit; end; end; - if cxPageControl1.ActivePageIndex=0 then + if cxPageControl1.ActivePageIndex = 0 then begin - if Trim(CengQty.Text)='' then + if Trim(CengQty.Text) = '' then begin - Application.MessageBox('ӲΪ!','ʾ',0); + Application.MessageBox('ӲΪ!', 'ʾ', 0); Exit; end; - end else - if cxPageControl1.ActivePageIndex=1 then + end + else if cxPageControl1.ActivePageIndex = 1 then begin - if Trim(CengQty.Text)='' then + if Trim(CengQty.Text) = '' then begin - Application.MessageBox('ÿŲΪ!','ʾ',0); + Application.MessageBox('ÿŲΪ!', 'ʾ', 0); Exit; end; end; - if Trim(PrtFlag.Text)<>'' then + if Trim(PrtFlag.Text) <> '' then begin - if Trim(ComboBox1.Text)='' then + if Trim(ComboBox1.Text) = '' then begin - Application.MessageBox('Ϊ!','ʾ',0); + Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; end; - Panel2.Visible:=True; + Panel2.Visible := True; Panel2.Refresh; - if cxPageControl1.ActivePageIndex=0 then + if cxPageControl1.ActivePageIndex = 0 then begin if SaveData() then begin InitData(); - Application.MessageBox('ɹ~','ʾ',0); + Application.MessageBox('ɹ~', 'ʾ', 0); end; - end else - if cxPageControl1.ActivePageIndex=1 then + end + else if cxPageControl1.ActivePageIndex = 1 then begin if SaveDataDuoCeng() then begin InitData(); - Application.MessageBox('ɹ~','ʾ',0); + Application.MessageBox('ɹ~', 'ʾ', 0); end; end; - Panel2.Visible:=False; - + Panel2.Visible := False; + end; procedure TfrmKuWeiInPutCeng.QuYuBtnClick(Sender: TObject); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='GGQuYu'; - flagname:=''; - if ShowModal=1 then + flag := 'GGQuYu'; + flagname := ''; + if ShowModal = 1 then begin - QuYu.Text:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + QuYu.Text := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; end; finally @@ -612,14 +618,14 @@ end; procedure TfrmKuWeiInPutCeng.FenQuBtnClick(Sender: TObject); begin try - frmZDYHelp:=TfrmZDYHelp.Create(Application); + frmZDYHelp := TfrmZDYHelp.Create(Application); with frmZDYHelp do begin - flag:='GGFenQu'; - flagname:=''; - if ShowModal=1 then + flag := 'GGFenQu'; + flagname := ''; + if ShowModal = 1 then begin - FenQu.Text:=Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); + FenQu.Text := Trim(ClientDataSet1.fieldbyname('ZdyName').AsString); end; end; finally @@ -630,13 +636,13 @@ end; procedure TfrmKuWeiInPutCeng.QuYuDblClick(Sender: TObject); begin - QuYu.Text:=''; + QuYu.Text := ''; InitData(); end; procedure TfrmKuWeiInPutCeng.FenQuDblClick(Sender: TObject); begin - FenQu.Text:=''; + FenQu.Text := ''; InitData(); end; @@ -647,21 +653,22 @@ end; procedure TfrmKuWeiInPutCeng.ToolButton1Click(Sender: TObject); begin - if ClientDataSet1.IsEmpty then Exit; - if ClientDataSet1.Locate('SSel',True,[])=False then + if ClientDataSet1.IsEmpty then + Exit; + if ClientDataSet1.Locate('SSel', True, []) = False then begin - Application.MessageBox('ûѡ!','ʾ',0); + Application.MessageBox('ûѡ!', 'ʾ', 0); Exit; end; ClientDataSet1.DisableControls; with ClientDataSet1 do begin First; - while Locate('SSel',True,[]) do + while Locate('SSel', True, []) do begin PrtData(Trim(ClientDataSet1.fieldbyname('KWID').AsString)); Edit; - FieldByName('SSel').Value:=False; + FieldByName('SSel').Value := False; end; end; ClientDataSet1.EnableControls; @@ -669,12 +676,13 @@ end; procedure TfrmKuWeiInPutCeng.N1Click(Sender: TObject); begin - SelOKNo(ClientDataSet1,True); + SelOKNo(ClientDataSet1, True); end; procedure TfrmKuWeiInPutCeng.N2Click(Sender: TObject); begin - SelOKNo(ClientDataSet1,False); + SelOKNo(ClientDataSet1, False); end; end. + diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiList.dfm b/云翔生产管理(MYSC.dll)/U_KuWeiList.dfm index bc7c80e..5c5fd1d 100644 --- a/云翔生产管理(MYSC.dll)/U_KuWeiList.dfm +++ b/云翔生产管理(MYSC.dll)/U_KuWeiList.dfm @@ -193,6 +193,13 @@ object frmKuWeiList: TfrmKuWeiList HeaderAlignmentHorz = taCenter Width = 74 end + object Tv1Column1: TcxGridDBColumn + Caption = #32534#21495 + DataBinding.FieldName = 'KWID' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end object v1Column1: TcxGridDBColumn Caption = #21306#22495 DataBinding.FieldName = 'QuYu' @@ -313,7 +320,7 @@ object frmKuWeiList: TfrmKuWeiList Left = 53 Top = 12 Width = 60 - Height = 24 + Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -15 @@ -328,7 +335,7 @@ object frmKuWeiList: TfrmKuWeiList Left = 165 Top = 12 Width = 60 - Height = 24 + Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -15 @@ -343,7 +350,7 @@ object frmKuWeiList: TfrmKuWeiList Left = 261 Top = 12 Width = 60 - Height = 24 + Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -15 @@ -358,7 +365,7 @@ object frmKuWeiList: TfrmKuWeiList Left = 497 Top = 12 Width = 152 - Height = 24 + Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -15 @@ -373,7 +380,7 @@ object frmKuWeiList: TfrmKuWeiList Left = 357 Top = 12 Width = 60 - Height = 24 + Height = 23 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -15 diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiList.pas b/云翔生产管理(MYSC.dll)/U_KuWeiList.pas index 82db966..d574a05 100644 --- a/云翔生产管理(MYSC.dll)/U_KuWeiList.pas +++ b/云翔生产管理(MYSC.dll)/U_KuWeiList.pas @@ -71,6 +71,7 @@ type Panel2: TPanel; ComboBox1: TComboBox; Label3: TLabel; + Tv1Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/云翔财务(Money.dll)/Money.dof b/云翔财务(Money.dll)/Money.dof index 5ed508f..94832a1 100644 --- a/云翔财务(Money.dll)/Money.dof +++ b/云翔财务(Money.dll)/Money.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\ֿ\Ŀ\\(Money.dll)\testDll.exe +HostApplication=D:\Project\D7myYunxiang\(Money.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/云翔财务(Money.dll)/Money.dpr b/云翔财务(Money.dll)/Money.dpr index 8479284..ae63818 100644 --- a/云翔财务(Money.dll)/Money.dpr +++ b/云翔财务(Money.dll)/Money.dpr @@ -9,7 +9,6 @@ uses U_DataLink in 'U_DataLink.pas' {DataLink_Money: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\Z99Dependency\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, - U_Fun in '..\Z99Dependency\ThreeFun\Fun\U_Fun.pas', U_SelExportField in '..\Z99Dependency\ThreeFun\Fun\U_SelExportField.pas' {frmSelExportField}, U_ColumnSet in '..\Z99Dependency\ThreeFun\Form\U_ColumnSet.pas' {frmColumnSet}, U_ZDYHelp in '..\Z99Dependency\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp}, @@ -38,7 +37,6 @@ uses U_GYSFKListView in 'U_GYSFKListView.pas' {frmGYSFKListView}, U_SCPerson in 'U_SCPerson.pas' {frmSCPerson}, U_YSSKList in 'U_YSSKList.pas' {frmYSSKList}, - U_RTFun in '..\..\..\RTFunAndForm\Fun\U_RTFun.pas', U_YSSKListRMBMJDZEY in 'U_YSSKListRMBMJDZEY.pas' {frmYSSKListRMBMJDZEY}, U_YSCRSaveQC in 'U_YSCRSaveQC.pas' {frmYSCRSaveQC}, U_CaiWuHuilV in 'U_CaiWuHuilV.pas' {frmCaiWuHuiLV}, @@ -46,7 +44,9 @@ uses U_YWYTop in 'U_YWYTop.pas' {frmYWYTop}, U_YWYTopKHMX in 'U_YWYTopKHMX.pas' {frmYWYTopKHMX}, U_TJWorkerPayListB in 'U_TJWorkerPayListB.pas' {frmTJWorkerPayListB}, - U_WorkPayInPutB in 'U_WorkPayInPutB.pas' {frmWorkPayInPutB}; + U_WorkPayInPutB in 'U_WorkPayInPutB.pas' {frmWorkPayInPutB}, + U_Fun in '..\Z99Dependency\ThreeFun\Fun\U_Fun.pas', + U_RTFun in '..\Z99Dependency\RTFunAndForm\Fun\U_RTFun.pas'; // U_SelfForm in '..\..\SelfForm\U_SelfForm.pas', // U_SelExportField in '..\..\SelfForm\U_SelExportField.pas' {frmSelExportField}, diff --git a/云翔财务(Money.dll)/ProjectGroup1.bpg b/云翔财务(Money.dll)/ProjectGroup1.bpg index 3a96072..342f6af 100644 --- a/云翔财务(Money.dll)/ProjectGroup1.bpg +++ b/云翔财务(Money.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = YSYF.dll testDll.exe +PROJECTS = testDll.exe Money.dll #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -YSYF.dll: YSYF.dpr - $(DCC) - testDll.exe: testDll.dpr $(DCC) +Money.dll: Money.dpr + $(DCC) + diff --git a/云翔财务(Money.dll)/U_BankMoneyKHList.dfm b/云翔财务(Money.dll)/U_BankMoneyKHList.dfm index 4f6a6b2..16eee32 100644 --- a/云翔财务(Money.dll)/U_BankMoneyKHList.dfm +++ b/云翔财务(Money.dll)/U_BankMoneyKHList.dfm @@ -1,6 +1,6 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList - Left = 89 - Top = 101 + Left = 381 + Top = 327 Width = 1351 Height = 617 Caption = #23458#25143#36153#29992#31649#29702 @@ -19,7 +19,7 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1335 + Width = 1343 Height = 31 ButtonHeight = 30 ButtonWidth = 65 @@ -92,7 +92,7 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList object Panel1: TPanel Left = 0 Top = 31 - Width = 1335 + Width = 1343 Height = 45 Align = alTop BevelInner = bvRaised @@ -152,7 +152,7 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList Left = 338 Top = 10 Width = 100 - Height = 26 + Height = 23 TabOrder = 0 OnChange = FactoryName10Change end @@ -161,7 +161,7 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList Left = 511 Top = 10 Width = 100 - Height = 26 + Height = 23 TabOrder = 1 OnChange = FactoryName10Change end @@ -207,7 +207,7 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList Left = 857 Top = 10 Width = 100 - Height = 26 + Height = 23 TabOrder = 5 OnChange = FactoryName10Change end @@ -230,8 +230,8 @@ object frmBankMoneyKHList: TfrmBankMoneyKHList object cxGrid2: TcxGrid Left = 0 Top = 76 - Width = 1335 - Height = 502 + Width = 1343 + Height = 510 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView diff --git a/云翔财务(Money.dll)/U_BankMoneyKHList.pas b/云翔财务(Money.dll)/U_BankMoneyKHList.pas index 8b8d92d..dc4715c 100644 --- a/云翔财务(Money.dll)/U_BankMoneyKHList.pas +++ b/云翔财务(Money.dll)/U_BankMoneyKHList.pas @@ -13,7 +13,21 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, BtnEdit, Menus, Buttons, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + 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 TfrmBankMoneyKHList = class(TForm) diff --git a/云翔财务(Money.dll)/U_DataLink.pas b/云翔财务(Money.dll)/U_DataLink.pas index 4f89035..46aed1c 100644 --- a/云翔财务(Money.dll)/U_DataLink.pas +++ b/云翔财务(Money.dll)/U_DataLink.pas @@ -4,40 +4,42 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, - Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore, - - dxSkinDarkRoom, - - - - - - - - dxSkinOffice2013White, - dxSkinSharpPlus, - dxSkinSpringTime, - dxSkinsDefaultPainters, - ; + Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, dxSkinsCore, + dxSkinDarkRoom, dxSkinOffice2013White, dxSkinSharpPlus, dxSkinSpringTime, + dxSkinsDefaultPainters, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinPumpkin, dxSkinSeven, + dxSkinSevenClassic, dxSkinSharp, dxSkinSilver, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, + dxSkinWhiteprint, dxSkinXmas2008Blue; + var - DConString:String; {ȫַ} - server, dtbase, user, pswd: String; {ݿӲ} - DCurHandle:hwnd; //ǰ - DName:string ; //#û#// - DCode:string ; //#û#// - Ddatabase:string; //#ݿ#// - DTitCaption:string; //##// - DParameters1,DParameters2,DParameters3,DParameters4,DParameters5:string;// ⲿ - DParameters6,DParameters7,DParameters8,DParameters9,DParameters10:string;//ⲿ - OldDllApp:Tapplication; //ԭо - NewDllApp: Tapplication;//ǰ - MainApplication: Tapplication ; - DFormCode:integer; //ǰں - IsDelphiLanguage:integer; - DServerDate:TdateTime; //ʱ - DCompany:string; //˾ - IpCall:Integer; - IpWLDZStr:string; + DConString: string; {ȫַ} + server, dtbase, user, pswd: string; {ݿӲ} + DCurHandle: hwnd; //ǰ + DName: string; //#û#// + DCode: string; //#û#// + Ddatabase: string; //#ݿ#// + DTitCaption: string; //##// + DParameters1, DParameters2, DParameters3, DParameters4, DParameters5: string; // ⲿ + DParameters6, DParameters7, DParameters8, DParameters9, DParameters10: string; //ⲿ + OldDllApp: Tapplication; //ԭо + NewDllApp: Tapplication; //ǰ + MainApplication: Tapplication; + DFormCode: integer; //ǰں + IsDelphiLanguage: integer; + DServerDate: TdateTime; //ʱ + DCompany: string; //˾ + IpCall: Integer; + IpWLDZStr: string; + type TDataLink_Money = class(TDataModule) AdoDataLink: TADOQuery; @@ -77,14 +79,10 @@ var implementation {$R *.dfm} - procedure TDataLink_Money.DataModuleDestroy(Sender: TObject); begin - DataLink_Money:=nil; + DataLink_Money := nil; end; end. - - - diff --git a/云翔财务(Money.dll)/U_FuFeeInPut.dfm b/云翔财务(Money.dll)/U_FuFeeInPut.dfm index c147ea7..beb7bd6 100644 --- a/云翔财务(Money.dll)/U_FuFeeInPut.dfm +++ b/云翔财务(Money.dll)/U_FuFeeInPut.dfm @@ -1,6 +1,6 @@ object frmFuFeeInPut: TfrmFuFeeInPut - Left = 113 - Top = 39 + Left = 453 + Top = 82 Width = 1084 Height = 605 Caption = #20379#24212#21830#36153#29992#30331#35760 @@ -20,7 +20,7 @@ object frmFuFeeInPut: TfrmFuFeeInPut object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1068 + Width = 1076 Height = 31 ButtonHeight = 30 ButtonWidth = 95 @@ -102,7 +102,7 @@ object frmFuFeeInPut: TfrmFuFeeInPut object Panel1: TPanel Left = 0 Top = 31 - Width = 1068 + Width = 1076 Height = 202 Align = alTop BevelInner = bvRaised @@ -342,8 +342,8 @@ object frmFuFeeInPut: TfrmFuFeeInPut object cxGrid2: TcxGrid Left = 0 Top = 233 - Width = 1068 - Height = 333 + Width = 1076 + Height = 341 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView diff --git a/云翔财务(Money.dll)/U_FuFeeInPut.pas b/云翔财务(Money.dll)/U_FuFeeInPut.pas index b49bf3a..1fc065f 100644 --- a/云翔财务(Money.dll)/U_FuFeeInPut.pas +++ b/云翔财务(Money.dll)/U_FuFeeInPut.pas @@ -13,7 +13,20 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, BtnEdit, 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 TfrmFuFeeInPut = class(TForm) diff --git a/云翔财务(Money.dll)/U_FuFeeList.dfm b/云翔财务(Money.dll)/U_FuFeeList.dfm index 49e000e..1deeb41 100644 --- a/云翔财务(Money.dll)/U_FuFeeList.dfm +++ b/云翔财务(Money.dll)/U_FuFeeList.dfm @@ -19,7 +19,7 @@ object frmFuFeeList: TfrmFuFeeList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1162 + Width = 1170 Height = 31 ButtonHeight = 30 ButtonWidth = 65 @@ -92,7 +92,7 @@ object frmFuFeeList: TfrmFuFeeList object Panel1: TPanel Left = 0 Top = 31 - Width = 1162 + Width = 1170 Height = 44 Align = alTop BevelInner = bvRaised @@ -166,8 +166,8 @@ object frmFuFeeList: TfrmFuFeeList object cxGrid2: TcxGrid Left = 0 Top = 75 - Width = 1162 - Height = 504 + Width = 1170 + Height = 512 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView diff --git a/云翔财务(Money.dll)/U_FuFeeList.pas b/云翔财务(Money.dll)/U_FuFeeList.pas index ec798db..05d9298 100644 --- a/云翔财务(Money.dll)/U_FuFeeList.pas +++ b/云翔财务(Money.dll)/U_FuFeeList.pas @@ -13,7 +13,21 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, BtnEdit, Menus, Buttons, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + 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 TfrmFuFeeList = class(TForm) diff --git a/云翔财务(Money.dll)/U_GYSListSel.dfm b/云翔财务(Money.dll)/U_GYSListSel.dfm index 0a6c8e8..a6ccb1a 100644 --- a/云翔财务(Money.dll)/U_GYSListSel.dfm +++ b/云翔财务(Money.dll)/U_GYSListSel.dfm @@ -1,6 +1,6 @@ object frmGYSListSel: TfrmGYSListSel - Left = 62 - Top = 25 + Left = 552 + Top = 557 Width = 1222 Height = 672 Caption = #20379#24212#21830#20449#24687#26597#35810 @@ -20,7 +20,7 @@ object frmGYSListSel: TfrmGYSListSel object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1206 + Width = 1214 Height = 31 ButtonHeight = 30 ButtonWidth = 65 @@ -67,7 +67,7 @@ object frmGYSListSel: TfrmGYSListSel object Panel1: TPanel Left = 0 Top = 31 - Width = 1206 + Width = 1214 Height = 35 Align = alTop BevelInner = bvRaised @@ -106,6 +106,19 @@ object frmGYSListSel: TfrmGYSListSel Font.Style = [fsBold] ParentFont = False end + object Label1: TLabel + Left = 569 + Top = 10 + Width = 32 + Height = 15 + Caption = #31867#22411 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -15 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object zjm: TEdit Tag = 2 Left = 83 @@ -126,12 +139,24 @@ object frmGYSListSel: TfrmGYSListSel OnBtnUpClick = KHTypeBtnUpClick OnBtnDnClick = KHTypeBtnDnClick end + object KHFlag: TComboBox + Left = 608 + Top = 5 + Width = 145 + Height = 23 + ItemHeight = 15 + TabOrder = 2 + OnChange = KHFlagChange + Items.Strings = ( + 'GYS' + 'KH') + end end object cxGrid1: TcxGrid Left = 0 Top = 66 - Width = 1206 - Height = 405 + Width = 1214 + Height = 413 Align = alClient TabOrder = 2 object TV1: TcxGridDBTableView @@ -229,8 +254,8 @@ object frmGYSListSel: TfrmGYSListSel end object cxGrid3: TcxGrid Left = 0 - Top = 471 - Width = 1206 + Top = 479 + Width = 1214 Height = 162 Align = alBottom TabOrder = 3 diff --git a/云翔财务(Money.dll)/U_GYSListSel.pas b/云翔财务(Money.dll)/U_GYSListSel.pas index d7973a3..b987eb6 100644 --- a/云翔财务(Money.dll)/U_GYSListSel.pas +++ b/云翔财务(Money.dll)/U_GYSListSel.pas @@ -5,15 +5,28 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB, - cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, - StdCtrls, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient, + cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls, + cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls, cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, - IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, - cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit, Buttons, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, + cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit, Buttons, 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 TfrmGYSListSel = class(TForm) @@ -55,6 +68,8 @@ type DS_HZ3: TDataSource; CDS_HZ3: TClientDataSet; cxGridPopupMenu4: TcxGridPopupMenu; + Label1: TLabel; + KHFlag: TComboBox; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -63,38 +78,36 @@ type procedure ToolButton2Click(Sender: TObject); procedure zjmChange(Sender: TObject); procedure KHTypeClick(Sender: TObject); - procedure V1SHStatusCustomDrawCell(Sender: TcxCustomGridTableView; - ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; - var ADone: Boolean); + procedure V1SHStatusCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure KHTypeBtnUpClick(Sender: TObject); procedure KHTypeBtnDnClick(Sender: TObject); procedure TV3DblClick(Sender: TObject); - procedure TV1MouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); + procedure TV1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); + procedure KHFlagChange(Sender: TObject); private { Private declarations } - ColorInt:Integer; + ColorInt: Integer; procedure InitGrid(); procedure InitGridBankMain(); public - canshu1,canshu2,FGYSType:string; + canshu1, canshu2, FGYSType: string; end; var frmGYSListSel: TfrmGYSListSel; implementation + uses - U_DataLink,U_RTFun,U_ZDYHelp, U_SCPerson; + U_DataLink, U_RTFun, U_ZDYHelp, U_SCPerson; {$R *.dfm} - procedure TfrmGYSListSel.InitGrid(); begin with ADOQueryMain do begin - Filtered:=False; + Filtered := False; Close; SQL.Clear; sql.Add(' select *,zjm=dbo.getpinyin(KHName)+KHName+dbo.getpinyin(KHNameJC)+KHNameJC+KHNO'); @@ -103,34 +116,35 @@ begin sql.add(' where isnull(KHFlag,'''') in (''GYS'',''KH'') and isnull(Valid,'''')=''Y'' '); Open; end; - SCreateCDS20(ADOQueryMain,CDS_HZ); - SInitCDSData20(ADOQueryMain,CDS_HZ); + SCreateCDS20(ADOQueryMain, CDS_HZ); + SInitCDSData20(ADOQueryMain, CDS_HZ); end; procedure TfrmGYSListSel.FormDestroy(Sender: TObject); begin - frmGYSListSel:=nil; + frmGYSListSel := nil; end; procedure TfrmGYSListSel.FormClose(Sender: TObject; var Action: TCloseAction); begin - Action:=caFree; + Action := caFree; end; procedure TfrmGYSListSel.TBCloseClick(Sender: TObject); begin - WriteCxGrid('PBGYS11YXCX',Tv1,'Ӧ̹'); + WriteCxGrid('PBGYS11YXCX', Tv1, 'Ӧ̹'); Close; end; + procedure TfrmGYSListSel.FormShow(Sender: TObject); var - fsj:String; + fsj: string; begin { fsj:='select Name=YWY from KH_Main where isnull(YWY,'''')<>'''' and Valid=''Y'' and isnull(KHFlag,'''')=''KH'' Group by YWY'; SInitComBoxBySql(ADOQueryTemp,YWY,False,fsj); fsj:='select Name=LiDan from KH_Main where isnull(LiDan,'''')<>'''' and Valid=''Y'' and isnull(KHFlag,'''')=''KH'' Group by LiDan'; SInitComBoxBySql(ADOQueryTemp,LiDan,False,fsj); } - ReadCxGrid('PBGYS11YXCX',Tv1,'Ӧ̹'); + ReadCxGrid('PBGYS11YXCX', Tv1, 'Ӧ̹'); InitGrid(); end; @@ -144,9 +158,9 @@ procedure TfrmGYSListSel.ToolButton2Click(Sender: TObject); begin if ADOQueryMain.Active then begin - SDofilter(ADOQueryMain,SGetFilters(Panel1,1,2)); - SCreateCDS20(ADOQueryMain,CDS_HZ); - SInitCDSData20(ADOQueryMain,CDS_HZ); + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS20(ADOQueryMain, CDS_HZ); + SInitCDSData20(ADOQueryMain, CDS_HZ); end; end; @@ -155,36 +169,33 @@ begin ToolButton2.Click; end; - procedure TfrmGYSListSel.KHTypeClick(Sender: TObject); begin ToolButton2.Click; end; -procedure TfrmGYSListSel.V1SHStatusCustomDrawCell( - Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; - AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +procedure TfrmGYSListSel.V1SHStatusCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); var - id:Integer; + id: Integer; begin - Id:=TV1.GetColumnByFieldName('SHStatus').Index; - if AViewInfo.GridRecord.Values[Id]='δ' then + id := TV1.GetColumnByFieldName('SHStatus').Index; + if AViewInfo.GridRecord.Values[id] = 'δ' then begin - ACanvas.Font.Color:=clRed; + ACanvas.Font.Color := clRed; end; end; procedure TfrmGYSListSel.KHTypeBtnUpClick(Sender: TObject); begin try - frmSCPerson:=TfrmSCPerson.Create(Application); + frmSCPerson := TfrmSCPerson.Create(Application); with frmSCPerson do begin - FlagStr:='GYSType'; - if ShowModal=1 then + FlagStr := 'GYSType'; + if ShowModal = 1 then begin - Self.KHType.Text:=Trim(FSDPerson); - Self.KHType.TxtCode:=Trim(FSDPerson); + Self.KHType.Text := Trim(FSDPerson); + Self.KHType.TxtCode := Trim(FSDPerson); end; end; finally @@ -195,43 +206,49 @@ end; procedure TfrmGYSListSel.KHTypeBtnDnClick(Sender: TObject); begin - KHType.Text:=''; - KHType.TxtCode:=''; + KHType.Text := ''; + KHType.TxtCode := ''; ToolButton2.Click; end; procedure TfrmGYSListSel.TV3DblClick(Sender: TObject); begin - if CDS_HZ.IsEmpty then exit; - ModalResult:=1; + if CDS_HZ.IsEmpty then + exit; + ModalResult := 1; end; + procedure TfrmGYSListSel.InitGridBankMain(); begin with ADOQueryTemp do begin Close; sql.Clear; - sql.Add('select * from KH_Sub_Bank where KHMainid='''+Trim(CDS_HZ.fieldbyname('KHMainid').asstring)+''''); + sql.Add('select * from KH_Sub_Bank where KHMainid=''' + Trim(CDS_HZ.fieldbyname('KHMainid').asstring) + ''''); if CDS_HZ.IsEmpty then begin sql.Add(' and 1=2'); - end else + end + else begin sql.Add(' and valid=''Y'' '); end; sql.Add(' order by XH'); Open; end; - SCreateCDS20(ADOQueryTemp,CDS_HZ3); - SInitCDSData20(ADOQueryTemp,CDS_HZ3); + SCreateCDS20(ADOQueryTemp, CDS_HZ3); + SInitCDSData20(ADOQueryTemp, CDS_HZ3); end; -procedure TfrmGYSListSel.TV1MouseDown(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); +procedure TfrmGYSListSel.TV1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin InitGridBankMain(); end; +procedure TfrmGYSListSel.KHFlagChange(Sender: TObject); +begin + ToolButton2.Click; +end; + end. - diff --git a/云翔财务(Money.dll)/U_KHListSelJJ.dfm b/云翔财务(Money.dll)/U_KHListSelJJ.dfm index 1be8fa3..5e8a7c2 100644 --- a/云翔财务(Money.dll)/U_KHListSelJJ.dfm +++ b/云翔财务(Money.dll)/U_KHListSelJJ.dfm @@ -1,6 +1,6 @@ object frmKHListSelJJ: TfrmKHListSelJJ - Left = 79 - Top = 32 + Left = 585 + Top = 166 Width = 1222 Height = 672 Caption = #23458#25143#20449#24687#31649#29702 @@ -20,7 +20,7 @@ object frmKHListSelJJ: TfrmKHListSelJJ object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1206 + Width = 1214 Height = 31 ButtonHeight = 30 ButtonWidth = 65 @@ -67,7 +67,7 @@ object frmKHListSelJJ: TfrmKHListSelJJ object Panel1: TPanel Left = 0 Top = 31 - Width = 1206 + Width = 1214 Height = 35 Align = alTop BevelInner = bvRaised @@ -286,16 +286,16 @@ object frmKHListSelJJ: TfrmKHListSelJJ object cxGrid1: TcxGrid Left = 0 Top = 66 - Width = 1206 - Height = 406 + Width = 1214 + Height = 413 Align = alClient TabOrder = 2 object TV1: TcxGridDBTableView OnDblClick = TV1DblClick OnMouseDown = TV1MouseDown - NavigatorButtons.ConfirmDelete = False - NavigatorButtons.Delete.Enabled = False - NavigatorButtons.Delete.Visible = False + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False DataController.DataSource = DS_HZ DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -362,9 +362,9 @@ object frmKHListSelJJ: TfrmKHListSelJJ DataBinding.FieldName = 'KHLXR' Visible = False HeaderAlignmentHorz = taCenter - Hidden = True Options.Editing = False Options.Focusing = False + VisibleForCustomization = False Width = 74 end object cxGridDBGYSTel: TcxGridDBColumn @@ -373,9 +373,9 @@ object frmKHListSelJJ: TfrmKHListSelJJ PropertiesClassName = 'TcxTextEditProperties' Visible = False HeaderAlignmentHorz = taCenter - Hidden = True Options.Editing = False Options.Focusing = False + VisibleForCustomization = False Width = 173 end object V1SHStatus: TcxGridDBColumn @@ -410,16 +410,16 @@ object frmKHListSelJJ: TfrmKHListSelJJ end object cxGrid3: TcxGrid Left = 0 - Top = 472 - Width = 1206 + Top = 479 + Width = 1214 Height = 162 Align = alBottom TabOrder = 3 object TV3: TcxGridDBTableView OnDblClick = TV3DblClick - NavigatorButtons.ConfirmDelete = False - NavigatorButtons.Delete.Enabled = False - NavigatorButtons.Delete.Visible = False + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False DataController.DataSource = DS_HZ3 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -533,6 +533,7 @@ object frmKHListSelJJ: TfrmKHListSelJJ end object cxStyleRepository1: TcxStyleRepository Left = 240 + PixelsPerInch = 96 object cxStyle1: TcxStyle AssignedValues = [svFont] Font.Charset = ANSI_CHARSET diff --git a/云翔财务(Money.dll)/U_KHListSelJJ.pas b/云翔财务(Money.dll)/U_KHListSelJJ.pas index 5b084e2..bce1bf0 100644 --- a/云翔财务(Money.dll)/U_KHListSelJJ.pas +++ b/云翔财务(Money.dll)/U_KHListSelJJ.pas @@ -12,7 +12,22 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, - cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit, Buttons; + cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, Menus, BtnEdit, Buttons, + 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 TfrmKHListSelJJ = class(TForm) @@ -115,7 +130,7 @@ begin sql.Add(' select *,zjm=dbo.getpinyin(KHName)+KHName+KHNo,KHNameJCZJM=dbo.getpinyin(KHNameJC)+KHNameJC'); sql.add(',SHStatus=(case when isnull(status,''0'')=''0'' then ''δ'' else '''' end)'); sql.Add(' from KH_Main A '); - sql.add(' where isnull(KHFlag,'''')='''+Trim('KH')+''' and isnull(Valid,'''')=''Y'' '); + sql.add(' where isnull(KHFlag,'''')=''KH'' and isnull(Valid,'''')=''Y'' '); if Trim(canshu2)<>'Ȩ' then begin sql.Add(' and (isnull(YWY,'''')='''+Trim(DName)+''' or isnull(LiDan,'''')='''+Trim(DName)+''')'); diff --git a/云翔财务(Money.dll)/U_KHSKList.dfm b/云翔财务(Money.dll)/U_KHSKList.dfm index 3cd5e18..ac7e7ee 100644 --- a/云翔财务(Money.dll)/U_KHSKList.dfm +++ b/云翔财务(Money.dll)/U_KHSKList.dfm @@ -19,7 +19,7 @@ object frmKHSKList: TfrmKHSKList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1783 + Width = 1791 Height = 31 ButtonHeight = 30 ButtonWidth = 65 @@ -92,7 +92,7 @@ object frmKHSKList: TfrmKHSKList object Panel1: TPanel Left = 0 Top = 31 - Width = 1783 + Width = 1791 Height = 75 Align = alTop BevelInner = bvRaised @@ -188,7 +188,7 @@ object frmKHSKList: TfrmKHSKList Left = 543 Top = 10 Width = 100 - Height = 26 + Height = 23 TabOrder = 0 end object begdate: TDateTimePicker @@ -224,7 +224,7 @@ object frmKHSKList: TfrmKHSKList Left = 544 Top = 42 Width = 100 - Height = 26 + Height = 23 TabOrder = 4 end object BZType: TComboBox @@ -245,7 +245,7 @@ object frmKHSKList: TfrmKHSKList Left = 64 Top = 42 Width = 100 - Height = 26 + Height = 23 TabOrder = 6 end object GSNO: TEdit @@ -253,7 +253,7 @@ object frmKHSKList: TfrmKHSKList Left = 715 Top = 10 Width = 100 - Height = 26 + Height = 23 TabOrder = 7 end object BKNO: TEdit @@ -261,7 +261,7 @@ object frmKHSKList: TfrmKHSKList Left = 715 Top = 42 Width = 100 - Height = 26 + Height = 23 TabOrder = 8 end object FactoryNameHZ: TEdit @@ -269,7 +269,7 @@ object frmKHSKList: TfrmKHSKList Left = 64 Top = 10 Width = 225 - Height = 26 + Height = 23 TabOrder = 9 OnChange = FactoryNameHZChange end @@ -277,8 +277,8 @@ object frmKHSKList: TfrmKHSKList object cxGrid2: TcxGrid Left = 0 Top = 106 - Width = 1783 - Height = 655 + Width = 1791 + Height = 663 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView diff --git a/云翔财务(Money.dll)/U_KHSKList.pas b/云翔财务(Money.dll)/U_KHSKList.pas index d8615e4..7b8b1c3 100644 --- a/云翔财务(Money.dll)/U_KHSKList.pas +++ b/云翔财务(Money.dll)/U_KHSKList.pas @@ -13,7 +13,21 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, BtnEdit, Menus, Buttons, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + 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 TfrmKHSKList = class(TForm) diff --git a/云翔财务(Money.dll)/U_YFCRSave.dfm b/云翔财务(Money.dll)/U_YFCRSave.dfm index 9848323..736ec38 100644 --- a/云翔财务(Money.dll)/U_YFCRSave.dfm +++ b/云翔财务(Money.dll)/U_YFCRSave.dfm @@ -7,22 +7,22 @@ object frmYFCRSave: TfrmYFCRSave Color = clBtnFace Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -13 + Font.Height = -12 Font.Name = #23435#20307 Font.Style = [] OldCreateOrder = False OnClose = FormClose OnDestroy = FormDestroy OnShow = FormShow - PixelsPerInch = 107 - TextHeight = 13 + PixelsPerInch = 96 + TextHeight = 12 object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1324 + Width = 1332 Height = 31 ButtonHeight = 30 - ButtonWidth = 87 + ButtonWidth = 83 Caption = 'ToolBar1' Color = clSkyBlue Flat = True @@ -40,7 +40,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = TBRafreshClick end object ToolButton2: TToolButton - Left = 65 + Left = 63 Top = 0 AutoSize = True Caption = #36807#28388 @@ -48,7 +48,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton2Click end object ToolButton4: TToolButton - Left = 130 + Left = 126 Top = 0 AutoSize = True Caption = #33258#21160#29983#25104 @@ -56,7 +56,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton4Click end object ToolButton6: TToolButton - Left = 221 + Left = 213 Top = 0 AutoSize = True Caption = #25209#37327#20445#23384 @@ -64,7 +64,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton6Click end object ToolButton5: TToolButton - Left = 312 + Left = 300 Top = 0 AutoSize = True Caption = #20445#23384 @@ -72,14 +72,14 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton5Click end object TBCopy: TToolButton - Left = 377 + Left = 363 Top = 0 Caption = #22797#21046#22686#34892 ImageIndex = 57 OnClick = TBCopyClick end object ToolButton3: TToolButton - Left = 464 + Left = 446 Top = 0 AutoSize = True Caption = #22686#34892 @@ -87,7 +87,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton3Click end object TBDel: TToolButton - Left = 529 + Left = 509 Top = 0 AutoSize = True Caption = #21024#38500 @@ -95,7 +95,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = TBDelClick end object ToolButton1: TToolButton - Left = 594 + Left = 572 Top = 0 AutoSize = True Caption = #23548#20986 @@ -103,7 +103,7 @@ object frmYFCRSave: TfrmYFCRSave OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 659 + Left = 635 Top = 0 AutoSize = True Caption = #20851#38381 @@ -114,132 +114,132 @@ object frmYFCRSave: TfrmYFCRSave object Panel1: TPanel Left = 0 Top = 31 - Width = 1324 - Height = 67 + Width = 1332 + Height = 61 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 object Label3: TLabel - Left = 189 - Top = 14 - Width = 58 - Height = 13 + Left = 174 + Top = 13 + Width = 53 + Height = 12 Caption = #20379' '#24212' '#21830 Font.Charset = GB2312_CHARSET Font.Color = clBlue - Font.Height = -13 + Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object Label2: TLabel - Left = 24 - Top = 14 - Width = 52 - Height = 13 + Left = 22 + Top = 13 + Width = 48 + Height = 12 Caption = #26597#35810#26085#26399 end object Label4: TLabel - Left = 364 - Top = 14 - Width = 26 - Height = 13 + Left = 336 + Top = 13 + Width = 24 + Height = 12 Caption = #21697#21517 end object Label5: TLabel - Left = 364 - Top = 40 - Width = 26 - Height = 13 + Left = 336 + Top = 37 + Width = 24 + Height = 12 Caption = #35268#26684 end object Label6: TLabel - Left = 503 - Top = 14 - Width = 26 - Height = 13 + Left = 464 + Top = 13 + Width = 24 + Height = 12 Caption = #25968#37327 end object Label10: TLabel - Left = 503 - Top = 40 - Width = 26 - Height = 13 + Left = 464 + Top = 37 + Width = 24 + Height = 12 Caption = #37329#39069 end object Label12: TLabel - Left = 648 - Top = 40 - Width = 52 - Height = 13 + Left = 598 + Top = 37 + Width = 48 + Height = 12 Caption = #26159#21542#24320#31080 end object Label1: TLabel - Left = 189 - Top = 40 - Width = 56 - Height = 13 + Left = 174 + Top = 37 + Width = 52 + Height = 12 Caption = #36865#36135#21333#21495 Font.Charset = GB2312_CHARSET Font.Color = clBlue - Font.Height = -13 + Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False end object FactoryName10: TEdit Tag = 2 - Left = 247 - Top = 10 - Width = 100 - Height = 20 + Left = 228 + Top = 9 + Width = 92 + Height = 21 TabOrder = 0 OnChange = FactoryName10Change OnKeyPress = FactoryName10KeyPress end object begdate: TDateTimePicker - Left = 78 - Top = 10 - Width = 94 - Height = 21 + Left = 72 + Top = 9 + Width = 87 + Height = 20 Date = 41256.918237847230000000 Time = 41256.918237847230000000 TabOrder = 1 end object Enddate: TDateTimePicker - Left = 78 - Top = 36 - Width = 94 - Height = 21 + Left = 72 + Top = 33 + Width = 87 + Height = 20 Date = 41256.918237847230000000 Time = 41256.918237847230000000 TabOrder = 2 end object P_CodeName: TEdit Tag = 2 - Left = 392 - Top = 10 - Width = 97 - Height = 20 + Left = 362 + Top = 9 + Width = 89 + Height = 21 TabOrder = 3 OnChange = FactoryName10Change end object P_spec: TEdit Tag = 2 - Left = 392 - Top = 36 - Width = 97 - Height = 20 + Left = 362 + Top = 33 + Width = 89 + Height = 21 TabOrder = 4 OnChange = FactoryName10Change end object CheckBox1: TCheckBox - Left = 18 - Top = 37 - Width = 59 - Height = 18 + Left = 17 + Top = 34 + Width = 54 + Height = 17 Caption = #25353#26085#26399 Checked = True State = cbChecked @@ -247,30 +247,30 @@ object frmYFCRSave: TfrmYFCRSave end object QtyStr: TEdit Tag = 1 - Left = 531 - Top = 10 - Width = 96 - Height = 20 + Left = 490 + Top = 9 + Width = 89 + Height = 21 TabOrder = 6 OnChange = FactoryName10Change end object MoneyStr: TEdit Tag = 1 - Left = 531 - Top = 36 - Width = 96 - Height = 20 + Left = 490 + Top = 33 + Width = 89 + Height = 21 TabOrder = 7 OnChange = FactoryName10Change end object KPType: TComboBox Tag = 2 - Left = 702 - Top = 36 - Width = 101 - Height = 21 + Left = 648 + Top = 33 + Width = 93 + Height = 20 Style = csDropDownList - ItemHeight = 13 + ItemHeight = 12 TabOrder = 8 OnChange = FactoryName10Change Items.Strings = ( @@ -280,10 +280,10 @@ object frmYFCRSave: TfrmYFCRSave end object YunDanNo: TEdit Tag = 2 - Left = 247 - Top = 36 - Width = 100 - Height = 20 + Left = 228 + Top = 33 + Width = 92 + Height = 21 TabOrder = 9 OnChange = FactoryName10Change OnKeyPress = YunDanNoKeyPress @@ -291,16 +291,16 @@ object frmYFCRSave: TfrmYFCRSave end object cxGrid2: TcxGrid Left = 0 - Top = 98 - Width = 1324 - Height = 566 + Top = 92 + Width = 1332 + Height = 581 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView OnMouseDown = Tv2MouseDown - NavigatorButtons.ConfirmDelete = False - NavigatorButtons.Delete.Enabled = False - NavigatorButtons.Delete.Visible = False + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False DataController.DataSource = DS_HZ DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = < @@ -388,7 +388,7 @@ object frmYFCRSave: TfrmYFCRSave Properties.OnButtonClick = v2Column8PropertiesButtonClick Visible = False HeaderAlignmentHorz = taCenter - Hidden = True + VisibleForCustomization = False Width = 114 end object v2Column6: TcxGridDBColumn @@ -552,7 +552,7 @@ object frmYFCRSave: TfrmYFCRSave Properties.OnEditValueChanged = v2Column7PropertiesEditValueChanged Visible = False HeaderAlignmentHorz = taCenter - Hidden = True + VisibleForCustomization = False Width = 64 end object VOrderNo: TcxGridDBColumn @@ -567,8 +567,8 @@ object frmYFCRSave: TfrmYFCRSave Properties.ReadOnly = True Visible = False HeaderAlignmentHorz = taCenter - Hidden = True Options.Editing = False + VisibleForCustomization = False Width = 99 end object v2Column11: TcxGridDBColumn diff --git a/云翔财务(Money.dll)/U_YFCRSave.pas b/云翔财务(Money.dll)/U_YFCRSave.pas index 1404171..27efda3 100644 --- a/云翔财务(Money.dll)/U_YFCRSave.pas +++ b/云翔财务(Money.dll)/U_YFCRSave.pas @@ -12,7 +12,22 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar, - cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit; + cxButtonEdit, cxTextEdit, cxPC, cxDropDownEdit, 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 TfrmYFCRSave = class(TForm) diff --git a/生产计划单(DyeingFinishingPlan.dll)/U_JYJT_New.pas b/生产计划单(DyeingFinishingPlan.dll)/U_JYJT_New.pas index 638ebb1..9bcdab9 100644 --- a/生产计划单(DyeingFinishingPlan.dll)/U_JYJT_New.pas +++ b/生产计划单(DyeingFinishingPlan.dll)/U_JYJT_New.pas @@ -413,7 +413,7 @@ begin sql.Add(fwhere + ') temp_row'); sql.Add(' where rownumber> ' + inttostr((CurrentPage - 1) * RecordsNumber)); sql.Add(' order by LBID,Filltime desc'); - ShowMessage(SQL.Text); +// ShowMessage(SQL.Text); Open; end;